SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Houston, we got a patch (#2731)

Browse Source 
* Houston, we got a patch

* is this the end of the beginning or the beginning of the end
This commit is contained in:
MiniDigger | Martin
2019-12-12 17:20:43 +01:00
parent 12013028b5
commit 3360d06f76
125 changed files with 643 additions and 6035 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
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/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 09112a8b0..d00e99cdb 100644
index cbaed08f5..6bad1687f 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -18,11 +18,11 @@ index 09112a8b0..d00e99cdb 100644
byte b0 = (Byte) this.datawatcher.get(EntityInsentient.b);
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index 832375f27..cdaa7f636 100644
index c8e4dcdac..1c2c05ae3 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 {
private int bF;
private int bC;
public int drownedConversionTime;
private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field
+ private boolean shouldBurnInDay = true; // Paper
@@ -48,15 +48,15 @@ index 832375f27..cdaa7f636 100644
+ }
+ // Paper end
+
protected void ea() {
protected void ev() {
this.b(EntityTypes.DROWNED);
this.world.a((EntityHuman) null, 1040, new BlockPosition(this), 0);
@@ -0,0 +0,0 @@ public class EntityZombie extends EntityMonster {
}
}
+ public boolean shouldBurnInDay() { return I_(); } // Paper - OBFHELPER
protected boolean I_() {
+ public boolean shouldBurnInDay() { return K_(); } // Paper - OBFHELPER
protected boolean K_() {
- return true;
+ return shouldBurnInDay;
}
@@ -71,8 +71,8 @@ index 832375f27..cdaa7f636 100644
public boolean damageEntity(DamageSource damagesource, float f) {
if (super.damageEntity(damagesource, f)) {
@@ -0,0 +0,0 @@ public class EntityZombie extends EntityMonster {
nbttagcompound.setBoolean("CanBreakDoors", this.ed());
nbttagcompound.setInt("InWaterTime", this.isInWater() ? this.bF : -1);
nbttagcompound.setBoolean("CanBreakDoors", this.ey());
nbttagcompound.setInt("InWaterTime", this.isInWater() ? this.bC : -1);
nbttagcompound.setInt("DrownedConversionTime", this.isDrownConverting() ? this.drownedConversionTime : -1);
+ nbttagcompound.setBoolean("Paper.ShouldBurnInDay", shouldBurnInDay); // Paper
}