1.15.2 update (#2887)

Functional GUI fix added by billygalbreath
This commit is contained in:
Spottedleaf
2020-01-21 18:02:07 -08:00
parent 5141569293
commit 9774f1ff47
519 changed files with 960 additions and 961 deletions

View File

@@ -19,7 +19,7 @@ index 9c52e31f4..33ce9a500 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index c03fcd2d3..3f493f415 100644
index fe0b08220..a738848ec 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
@@ -32,8 +32,8 @@ index c03fcd2d3..3f493f415 100644
return false;
}
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
public void d(EnumHand enumhand) {
this.c(enumhand == EnumHand.MAIN_HAND ? EnumItemSlot.MAINHAND : EnumItemSlot.OFFHAND);
public void broadcastItemBreak(EnumHand enumhand) {
this.broadcastItemBreak(enumhand == EnumHand.MAIN_HAND ? EnumItemSlot.MAINHAND : EnumItemSlot.OFFHAND);
}
+ // Paper start
+ public int shieldBlockingDelay = world.paperConfig.shieldBlockingDelay;