diff options
Diffstat (limited to 'Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch')
| -rw-r--r-- | Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch index ec18bb16cc..60d8608dd5 100644 --- a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch +++ b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch @@ -1,11 +1,11 @@ -From 66a919e1275e53a9d28c58b412e473ab6e9baa78 Mon Sep 17 00:00:00 2001 +From e908056a4daf3e4518969e549bf3a48147229fa3 Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Tue, 1 Mar 2016 23:58:50 -0600 Subject: [PATCH] Configurable top of nether void damage diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 06d1527..2767ffb 100644 +index 06d15276..2767ffb7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -143,4 +143,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 06d1527..2767ffb 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 537adb5..7f6d492 100644 +index 1e2e042b..e851e78a 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -394,9 +394,15 @@ public abstract class Entity implements ICommandListener { @@ -67,10 +67,10 @@ index 537adb5..7f6d492 100644 this.die(); } diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -index fdacb6d..ec75bab 100644 +index fd3337d3..ca1faa41 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -@@ -206,9 +206,15 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT +@@ -204,9 +204,15 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT this.setDamage(this.getDamage() - 1.0F); } @@ -87,5 +87,5 @@ index fdacb6d..ec75bab 100644 int i; -- -2.9.3 +2.12.0.windows.1 |