Update Paper to MC 1.12

This commit is contained in:
Shane Freeder
2017-06-08 15:16:51 +01:00
parent 30cc65c220
commit 8bb457e352
22 changed files with 80 additions and 92 deletions

View File

@@ -32,7 +32,7 @@ index fbe769eb3..d2a542354 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 094891057..5cd82f1b2 100644
index 14b6439c2..724e85aa3 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener {
@@ -44,13 +44,13 @@ index 094891057..5cd82f1b2 100644
+
+ public boolean doWaterMovement() {
+ // Paper end
if (this.bH() instanceof EntityBoat) {
if (this.bJ() instanceof EntityBoat) {
this.inWater = false;
} else if (this.world.a(this.getBoundingBox().grow(0.0D, -0.4000000059604645D, 0.0D).shrink(0.001D), Material.WATER, this)) {
@@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener {
}
public boolean bm() {
public boolean bo() {
+ return this.pushedByWater();
+ }
+