Limework/SkStuff
2
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 6 Wiki Activity

Some COOL stuff

Browse Source 
Fixed PathfinderGoalMeleeAttack
Fixed error when using remove/clear pathfinder goals on an armor stand
(why is it considered a living entity?!?)
Forgot to make NBTListIndex return a single value, now fixed
Added "Minecraft ID of %itemtype%" (to return for example
"minecraft:planks")
Also some stuff I don't remember (see the changes!)
This commit is contained in:
TheBukor
2016-03-13 04:06:43 -03:00
parent 36b069fa3e
commit 48685db4be
13 changed files with 239 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/me/TheBukor/SkStuff/effects/EffClearPathGoals.java
+2 -1
View File
@@ -2,6 +2,7 @@ package me.TheBukor.SkStuff.effects;
import javax.annotation.Nullable;
import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
@@ -31,7 +32,7 @@ public class EffClearPathGoals extends Effect {
protected void execute(Event e) {
LivingEntity[] ents = entities.getAll(e);
for (LivingEntity ent : ents) {
if (ent instanceof Player || ent == null)
if (ent instanceof Player || ent instanceof ArmorStand || ent == null)
continue;
SkStuff.getNMSMethods().clearPathfinderGoals(ent);
}
src/me/TheBukor/SkStuff/effects/EffRemovePathGoal.java
+2 -1
View File
@@ -4,6 +4,7 @@ import java.lang.reflect.InvocationTargetException;
import javax.annotation.Nullable;
import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.Blaze;
import org.bukkit.entity.Creature;
import org.bukkit.entity.Ghast;
@@ -45,7 +46,7 @@ public class EffRemovePathGoal extends Effect {
protected void execute(Event e) {
LivingEntity[] ents = entities.getAll(e);
for (LivingEntity ent : ents) {
if (ent instanceof Player || ent == null)
if (ent instanceof Player || ent instanceof ArmorStand || ent == null)
return;
Object obcEnt = craftLivEnt.cast(ent);
Object nmsEnt = null;
src/me/TheBukor/SkStuff/effects/EffSetPathGoal.java
+11 -21
View File
@@ -9,6 +9,7 @@ import javax.annotation.Nullable;
import org.bukkit.Material;
import org.bukkit.entity.Animals;
import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.Blaze;
import org.bukkit.entity.Creeper;
import org.bukkit.entity.Enderman;
@@ -149,7 +150,7 @@ public class EffSetPathGoal extends Effect {
protected void execute(Event e) {
LivingEntity[] ents = entities.getAll(e);
for (LivingEntity ent : ents) {
if (ent == null || ent instanceof Player)
if (ent == null || ent instanceof Player || ent instanceof ArmorStand)
return;
int priority = (goalPriority == null ? 4 : goalPriority.getSingle(e).intValue());
@@ -174,7 +175,7 @@ public class EffSetPathGoal extends Effect {
for (EntityData<?> entData : types) {
if (!LivingEntity.class.isAssignableFrom(entData.getType()))
return;
String className = entData.getType().getClass().getSimpleName();
String className = entData.getType().getSimpleName();
if (className.equals("HumanEntity")) {
className = "Human";
} else if (className.equals("EntityLiving")) {
@@ -188,7 +189,7 @@ public class EffSetPathGoal extends Effect {
for (EntityData<?> entData : types) {
if (!LivingEntity.class.isAssignableFrom(entData.getType()))
return;
String className = entData.getType().getClass().getSimpleName();
String className = entData.getType().getSimpleName();
if (className.equals("HumanEntity")) {
className = "Human";
} else if (className.equals("EntityLiving")) {
@@ -239,7 +240,7 @@ public class EffSetPathGoal extends Effect {
for (EntityData<?> entData : types) {
if (!LivingEntity.class.isAssignableFrom(entData.getType()))
return;
String className = entData.getType().getClass().getSimpleName();
String className = entData.getType().getSimpleName();
if (className.equals("HumanEntity")) {
className = "Human";
} else if (className.equals("EntityLiving")) {
@@ -268,7 +269,7 @@ public class EffSetPathGoal extends Effect {
for (EntityData<?> entData : types) {
if (!LivingEntity.class.isAssignableFrom(entData.getType()))
return;
String className = entData.getType().getClass().getSimpleName();
String className = entData.getType().getSimpleName();
if (className.equals("HumanEntity")) {
className = "Human";
} else if (className.equals("EntityLiving")) {
@@ -284,7 +285,7 @@ public class EffSetPathGoal extends Effect {
for (EntityData<?> entData : types) {
if (!LivingEntity.class.isAssignableFrom(entData.getType()))
return;
String className = entData.getType().getClass().getSimpleName();
String className = entData.getType().getSimpleName();
if (className.equals("HumanEntity")) {
className = "Human";
} else if (className.equals("EntityLiving")) {
@@ -297,18 +298,7 @@ public class EffSetPathGoal extends Effect {
double spd = (meleeSpeed == null ? 1.0D : meleeSpeed.getSingle(e).doubleValue());
boolean memorize = (meleeMemorize == null ? false : meleeMemorize.getSingle(e));
Class<?> goalMeleeAttack = ReflectionUtils.getNMSClass("PathfinderGoalMeleeAttack");
for (EntityData<?> entData : types) {
if (!LivingEntity.class.isAssignableFrom(entData.getType()))
return;
String className = entData.getType().getClass().getSimpleName();
if (className.equals("HumanEntity")) {
className = "Human";
} else if (className.equals("EntityLiving")) {
className = "Living";
}
Class<?> nmsClass = ReflectionUtils.getNMSClass("Entity" + className);
newGoals.add(goalMeleeAttack.getConstructor(entCreature, Class.class, double.class, boolean.class).newInstance(nmsEnt, nmsClass, spd, memorize));
}
newGoals.add(goalMeleeAttack.getConstructor(entCreature, double.class, boolean.class).newInstance(nmsEnt, spd, memorize));
}
} else if (mark == 13) {
double spd = (moveTargetSpeed == null ? 1.0D : moveTargetSpeed.getSingle(e).doubleValue());
@@ -323,7 +313,7 @@ public class EffSetPathGoal extends Effect {
for (EntityData<?> entData : types) {
if (!LivingEntity.class.isAssignableFrom(entData.getType()))
return;
String className = entData.getType().getClass().getSimpleName();
String className = entData.getType().getSimpleName();
if (className.equals("HumanEntity")) {
className = "Human";
} else if (className.equals("EntityLiving")) {
@@ -338,7 +328,7 @@ public class EffSetPathGoal extends Effect {
for (EntityData<?> entData : types) {
if (!LivingEntity.class.isAssignableFrom(entData.getType()))
return;
String className = entData.getType().getClass().getSimpleName();
String className = entData.getType().getSimpleName();
if (className.equals("HumanEntity")) {
className = "Human";
} else if (className.equals("EntityLiving")) {
@@ -449,7 +439,7 @@ public class EffSetPathGoal extends Effect {
for (EntityData<?> entData : types) {
if (!LivingEntity.class.isAssignableFrom(entData.getType()))
return;
String className = entData.getType().getClass().getSimpleName();
String className = entData.getType().getSimpleName();
if (className.equals("HumanEntity")) {
className = "Human";
} else if (className.equals("EntityLiving")) {