diff options
| author | md_5 <git@md-5.net> | 2017-06-08 18:00:00 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2017-06-08 18:00:00 +1000 |
| commit | bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772 (patch) | |
| tree | a8e03741d518f6448cf4c5410b194a4396fede5e /nms-patches/Entity.patch | |
| parent | fe3ca95c764848be56e872e3de57c66cb07d7515 (diff) | |
| download | craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.tar craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.tar.gz craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.tar.lz craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.tar.xz craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.zip | |
Update to Minecraft 1.12
Diffstat (limited to 'nms-patches/Entity.patch')
| -rw-r--r-- | nms-patches/Entity.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nms-patches/Entity.patch b/nms-patches/Entity.patch index 11d14050..b0f9c0d4 100644 --- a/nms-patches/Entity.patch +++ b/nms-patches/Entity.patch @@ -111,7 +111,7 @@ + + if (this.al++ >= i) { + this.al = i; -+ this.portalCooldown = this.aK(); ++ this.portalCooldown = this.aM(); + byte b0; + + if (this.world.worldProvider.getDimensionManager().getDimensionID() == -1) { @@ -144,7 +144,7 @@ + public void Y() { this.world.methodProfiler.a("entityBaseTick"); - if (this.isPassenger() && this.bH().dead) { + if (this.isPassenger() && this.bJ().dead) { @@ -246,6 +361,8 @@ this.lastZ = this.locZ; this.lastPitch = this.pitch; @@ -439,7 +439,7 @@ entityitem.q(); @@ -1589,6 +1863,24 @@ - if (entity.bH() != this) { + if (entity.bJ() != this) { throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)"); } else { + // CraftBukkit start @@ -460,11 +460,11 @@ + } + } + // CraftBukkit end - if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.bC() instanceof EntityHuman)) { + if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.bE() instanceof EntityHuman)) { this.passengers.add(0, entity); } else { @@ -1602,6 +1894,22 @@ - if (entity.bH() == this) { + if (entity.bJ() == this) { throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)"); } else { + // CraftBukkit start @@ -705,7 +705,7 @@ public float getHeadHeight() { @@ -2295,7 +2728,7 @@ - for (Iterator iterator = this.bD().iterator(); iterator.hasNext(); entity.a(oclass, set)) { + for (Iterator iterator = this.bF().iterator(); iterator.hasNext(); entity.a(oclass, set)) { entity = (Entity) iterator.next(); if (oclass.isAssignableFrom(entity.getClass())) { - set.add(entity); |