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

A bit more work for 1.14

Browse Source
This commit is contained in:
Shane Freeder
2019-04-24 03:34:11 +01:00
parent 43b4755c1b
commit 024f92b2bb
11 changed files with 119 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Spigot-Server-Patches/Configurable-top-of-nether-void-damage.patch
View File

@@ -29,7 +29,7 @@ index 1ed58f4bba..a797a57671 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index b4b73dbfd3..ad30cdd824 100644
index c813b59af5..494c6cb4aa 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 INamableTileEntity, ICommandListener, Ke
@@ -40,7 +40,7 @@ index b4b73dbfd3..ad30cdd824 100644
+ // Extracted to own function
+ /*
if (this.locY < -64.0D) {
this.aa();
this.ae();
}
+ */
+ this.performVoidDamage();
@@ -49,7 +49,7 @@ index b4b73dbfd3..ad30cdd824 100644
if (!this.world.isClientSide) {
this.setFlag(0, this.fireTicks > 0);
@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.world.methodProfiler.exit();
this.world.getMethodProfiler().exit();
}
+ // Paper start
@@ -70,15 +70,15 @@ index b4b73dbfd3..ad30cdd824 100644
this.fireTicks = 0;
}
+ protected final void doVoidDamage() { this.aa(); } // Paper - OBFHELPER
protected void aa() {
+ protected final void doVoidDamage() { this.ae(); } // Paper - OBFHELPER
protected void ae() {
this.die();
}
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
index 205251bcdd..0f531e7d42 100644
index 4d2ef9a02b..6fc332dbff 100644
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -0,0 +0,0 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT
@@ -0,0 +0,0 @@ public abstract class EntityMinecartAbstract extends Entity {
this.setDamage(this.getDamage() - 1.0F);
}
@@ -86,12 +86,12 @@ index 205251bcdd..0f531e7d42 100644
+ // Extracted to own function
+ /*
if (this.locY < -64.0D) {
this.aa();
this.ae();
}
+ */
+ this.performVoidDamage();
+ // Paper end
int i;
// this.doPortalTick(); // CraftBukkit - handled in postTick
if (this.world.isClientSide) {
--