diff options
| author | Zach Brown <[email protected]> | 2018-10-23 19:03:32 -0400 |
|---|---|---|
| committer | Zach Brown <[email protected]> | 2018-10-23 19:03:32 -0400 |
| commit | b15c43a38971a92fff66282e937923cfad488a71 (patch) | |
| tree | b02bb3344f2615ce3f7f4da6b84fb244f71d41aa /Spigot-Server-Patches/0136-Optional-TNT-doesn-t-move-in-water.patch | |
| parent | e7245e68bd9289007c26e08809da599907f91f33 (diff) | |
| download | Paper-b15c43a38971a92fff66282e937923cfad488a71.tar.gz Paper-b15c43a38971a92fff66282e937923cfad488a71.zip | |
Update upstream for minecart spawner improvement
Diffstat (limited to 'Spigot-Server-Patches/0136-Optional-TNT-doesn-t-move-in-water.patch')
| -rw-r--r-- | Spigot-Server-Patches/0136-Optional-TNT-doesn-t-move-in-water.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Spigot-Server-Patches/0136-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0136-Optional-TNT-doesn-t-move-in-water.patch index f48cacde84..11e4e59426 100644 --- a/Spigot-Server-Patches/0136-Optional-TNT-doesn-t-move-in-water.patch +++ b/Spigot-Server-Patches/0136-Optional-TNT-doesn-t-move-in-water.patch @@ -1,11 +1,11 @@ -From c75aa93b1c1e98ce0d1f87d73720311182848d68 Mon Sep 17 00:00:00 2001 +From 2f2a111c6c9d153926439214dd99d853f17bc87a Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Sun, 22 May 2016 20:20:55 -0500 Subject: [PATCH] Optional TNT doesn't move in water diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 067cb233e4..06acdaaf04 100644 +index 067cb233..06acdaaf 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -2,7 +2,6 @@ package com.destroystokyo.paper; @@ -32,10 +32,10 @@ index 067cb233e4..06acdaaf04 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 0456cda937..2fbe17ce9d 100644 +index 360ac7b3..7284539f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1127,6 +1127,11 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper +@@ -1129,6 +1129,11 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper } public boolean aq() { @@ -47,7 +47,7 @@ index 0456cda937..2fbe17ce9d 100644 if (this.bJ() instanceof EntityBoat) { this.inWater = false; } else if (this.world.a(this.getBoundingBox().grow(0.0D, -0.4000000059604645D, 0.0D).shrink(0.001D), Material.WATER, this)) { -@@ -2605,6 +2610,11 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper +@@ -2608,6 +2613,11 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper } public boolean bo() { @@ -60,7 +60,7 @@ index 0456cda937..2fbe17ce9d 100644 } diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index bb0904f865..50811852a3 100644 +index bb0904f8..50811852 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java @@ -147,4 +147,49 @@ public class EntityTNTPrimed extends Entity { @@ -114,5 +114,5 @@ index bb0904f865..50811852a3 100644 + // Paper end } -- -2.18.0 +2.19.1 |