Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-12-28 20:17:50 +01:00
Code Issues Projects Releases Wiki Activity

Ground controllable NPCs can now jump using spacebar

Browse Source
This commit is contained in:
fullwall 2013-07-03 13:50:34 +08:00
parent fde461489a
commit b6b160e99b
1 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/net/citizensnpcs/trait/Controllable.java
View File

@ -1,6 +1,9 @@
package net.citizensnpcs.trait; package net.citizensnpcs.trait;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Map; import java.util.Map;
import net.citizensnpcs.Settings.Setting; import net.citizensnpcs.Settings.Setting;
@ -226,6 +229,7 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
} }
public class GroundController implements MovementController { public class GroundController implements MovementController {
private int jumpTicks;
private double speed = 0.07D; private double speed = 0.07D;
private void jump() { private void jump() {
@ -279,6 +283,24 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
newSpeed = 0.35D; newSpeed = 0.35D;
} }
try {
if (JUMP_FIELD.getBoolean(handle.passenger)) {
if (handle.onGround && jumpTicks == 0) {
JUMP_METHOD.invoke(handle, (Object[]) null);
jumpTicks = 10;
}
} else {
jumpTicks = 0;
}
jumpTicks = Math.max(0, jumpTicks - 1);
} catch (IllegalArgumentException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
e.printStackTrace();
}
if (newSpeed > oldSpeed && this.speed < 0.35D) { if (newSpeed > oldSpeed && this.speed < 0.35D) {
this.speed = Math.min(0.35D, (this.speed + ((0.35D - this.speed) / 35.0D))); this.speed = Math.min(0.35D, (this.speed + ((0.35D - this.speed) / 35.0D)));
} else { } else {
@ -304,6 +326,22 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
private static final Map<EntityType, Class<? extends MovementController>> controllerTypes = Maps private static final Map<EntityType, Class<? extends MovementController>> controllerTypes = Maps
.newEnumMap(EntityType.class); .newEnumMap(EntityType.class);
private static Field JUMP_FIELD;
private static Method JUMP_METHOD = null;
static {
JUMP_FIELD = NMS.getField(EntityLiving.class, "bd");
JUMP_FIELD.setAccessible(true);
try {
JUMP_METHOD = EntityLiving.class.getDeclaredMethod("ba", (Class<?>[]) null);
JUMP_METHOD.setAccessible(true);
} catch (SecurityException e) {
e.printStackTrace();
} catch (NoSuchMethodException e) {
e.printStackTrace();
}
}
static { static {
controllerTypes.put(EntityType.BAT, AirController.class); controllerTypes.put(EntityType.BAT, AirController.class);
controllerTypes.put(EntityType.BLAZE, AirController.class); controllerTypes.put(EntityType.BLAZE, AirController.class);