Don't merge player movements (fixes block breaking issues)

Fixes #1640
This commit is contained in:
Aikar
2018-11-03 00:18:10 -04:00
parent 219649aa3d
commit 93e5439f96
2 changed files with 25 additions and 8 deletions

View File

@@ -130,6 +130,25 @@ index 86488e9709..e6348a2931 100644
protected void initAttributes() {
super.initAttributes();
this.getAttributeMap().b(GenericAttributes.e);
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 4490b63258..aa5b58066a 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.keepLevel = false;
}
+ // Paper start
+ @Override
+ public boolean shouldMergeMovement(double mergeMin, double d0, double d1, double d2) {
+ // We need precise movement for players
+ return false;
+ }
+ // Paper end
+
@Override
public CraftPlayer getBukkitEntity() {
return (CraftPlayer) super.getBukkitEntity();
diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
index e63f4afa9b..f1266c0ce1 100644
--- a/src/main/java/net/minecraft/server/EntitySlime.java