diff options
| author | md_5 <git@md-5.net> | 2015-06-06 19:33:48 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2015-06-06 19:46:42 +1000 |
| commit | a65e45d889c1f040e1921eb84903af915df512db (patch) | |
| tree | 74ff87413ffc36de8640085c6b611b554a55b144 /nms-patches/EntityHuman.patch | |
| parent | a6a57a96d02e57264d45120ce9f272c18c64407a (diff) | |
| download | craftbukkit-a65e45d889c1f040e1921eb84903af915df512db.tar craftbukkit-a65e45d889c1f040e1921eb84903af915df512db.tar.gz craftbukkit-a65e45d889c1f040e1921eb84903af915df512db.tar.lz craftbukkit-a65e45d889c1f040e1921eb84903af915df512db.tar.xz craftbukkit-a65e45d889c1f040e1921eb84903af915df512db.zip | |
[SPIGOT-946] Begin making use of access transforms to simplify patching.
Diffstat (limited to 'nms-patches/EntityHuman.patch')
| -rw-r--r-- | nms-patches/EntityHuman.patch | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/nms-patches/EntityHuman.patch b/nms-patches/EntityHuman.patch index 50dd54c6..290b6434 100644 --- a/nms-patches/EntityHuman.patch +++ b/nms-patches/EntityHuman.patch @@ -29,32 +29,14 @@ protected int bm; public float bn; public float bo; -@@ -25,15 +39,16 @@ - public double bt; - public double bu; - public double bv; -- protected boolean sleeping; -+ public boolean sleeping; // CraftBukkit - public - public BlockPosition bx; -- private int sleepTicks; -+ public int sleepTicks; // CraftBukkit - public - public float by; - public float bz; - private BlockPosition c; - private boolean d; - private BlockPosition e; - public PlayerAbilities abilities = new PlayerAbilities(); -+ public int oldLevel = -1; // CraftBukkit - add field - public int expLevel; - public int expTotal; - public float exp; -@@ -47,6 +62,16 @@ +@@ -47,6 +61,17 @@ private boolean bI = false; public EntityFishingHook hookedFish; + // CraftBukkit start + public boolean fauxSleeping; + public String spawnWorld = ""; ++ public int oldLevel = -1; + + @Override + public CraftHumanEntity getBukkitEntity() { @@ -98,15 +80,6 @@ ItemStack itemstack = this.g.b(this.world, this); if (itemstack != this.g || itemstack != null && itemstack.count != i) { -@@ -283,7 +334,7 @@ - return this.getHealth() <= 0.0F || this.isSleeping(); - } - -- protected void closeInventory() { -+ public void closeInventory() { // CraftBukkit - public - this.activeContainer = this.defaultContainer; - } - @@ -324,7 +375,8 @@ if (this.world.getDifficulty() == EnumDifficulty.PEACEFUL && this.world.getGameRules().getBoolean("naturalRegeneration")) { |