twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 12:42:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update upstream BD/B/CB/S

Browse Source 
Note to other developers: This commit may require you to wipe your
workspace as a result of the changes to BD.

--- work/BuildData
Submodule work/BuildData f527a8ff..d56672db:
  > Mappings Update

--- work/Bukkit
Submodule work/Bukkit 0c1d258bb..db06c80d7:
  > Add list of entities to EntityTransformEvent
  > SPIGOT-4347: Add API to allow storing arbitrary values on ItemStacks

---work/CraftBukkit
Submodule work/CraftBukkit 6a398ac44..068dab5be:
  > Enable optional source JAR shading via profile shadeSourcesJar
  > Use ImmutableList rather than AbstractList for CraftMetaBook
  > Fix setRecipes(List) not setting Knowledge Book recipes.
  > Mappings Update
  > Add list of entities to EntityTransformEvent & move die calls
  > SPIGOT-4347: Add API to allow storing arbitrary values on ItemStacks
  > Add Vanilla help to default permissions

--- work/Spigot
Submodule work/Spigot a1f2566f6..e769fe4d9:
  > Mappings Update
  > Rebuild patches
This commit is contained in:
Zach Brown
2018-12-08 05:09:55 -05:00
parent 9bfaa301aa
commit 1c4b67eab2
107 changed files with 467 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Spigot-Server-Patches/Add-more-Zombie-API.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add more Zombie API
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index 69a12bab3..877d73f3b 100644
index 2d87dca68..4c0ef6e28 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -0,0 +0,0 @@ public class EntityZombie extends EntityMonster {
@@ -28,17 +28,17 @@ index 69a12bab3..877d73f3b 100644
public EntityZombie(EntityTypes<?> entitytypes, World world) {
super(entitytypes, world);
@@ -0,0 +0,0 @@ public class EntityZombie extends EntityMonster {
this.getDataWatcher().register(EntityZombie.bF, Boolean.valueOf(false));
this.getDataWatcher().register(EntityZombie.bF, false);
}
+ public boolean isDrowning() { return dG(); } // Paper - OBFHELPER
public boolean dG() {
return ((Boolean) this.getDataWatcher().get(EntityZombie.bF)).booleanValue();
+ public boolean isDrowning() { return isDrownConverting(); } // Paper - OBFHELPER
public boolean isDrownConverting() {
return (Boolean) this.getDataWatcher().get(EntityZombie.bF);
}
+ public void setArmsRaised(boolean raised) { s(raised); } // Paper - OBFHELPER
public void s(boolean flag) {
this.getDataWatcher().set(EntityZombie.bE, Boolean.valueOf(flag));
this.getDataWatcher().set(EntityZombie.bE, flag);
}
+ // Paper start
@@ -56,13 +56,13 @@ index 69a12bab3..877d73f3b 100644
+ public void startDrowning(int drownedConversionTime) { a(drownedConversionTime); } // Paper - OBFHELPER
private void a(int i) {
this.bJ = i;
this.getDataWatcher().set(EntityZombie.bF, Boolean.valueOf(true));
this.drownedConversionTime = i;
this.getDataWatcher().set(EntityZombie.bF, true);
}
+ // Paper start
+ public void stopDrowning() {
+ this.bJ = -1;
+ this.drownedConversionTime = -1;
+ this.getDataWatcher().set(EntityZombie.drowning, Boolean.valueOf(false));
+ }
+ // Paper end
@@ -92,7 +92,7 @@ index 69a12bab3..877d73f3b 100644
@@ -0,0 +0,0 @@ public class EntityZombie extends EntityMonster {
nbttagcompound.setBoolean("CanBreakDoors", this.dH());
nbttagcompound.setInt("InWaterTime", this.isInWater() ? this.bI : -1);
nbttagcompound.setInt("DrownedConversionTime", this.dG() ? this.bJ : -1);
nbttagcompound.setInt("DrownedConversionTime", this.isDrownConverting() ? this.drownedConversionTime : -1);
+ nbttagcompound.setBoolean("Paper.ShouldBurnInDay", shouldBurnInDay); // Paper
}