diff options
| author | Shane Freeder <[email protected]> | 2019-07-16 23:09:32 +0100 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2019-07-16 23:09:32 +0100 |
| commit | 0708fa363b83f2ba47d858c9bfb94ffeb11b5ba1 (patch) | |
| tree | 88ed626dc8407e465fd1e082d9309d74c5ef1e44 /Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch | |
| parent | 767ac20c2c63438929b16313dbc6c85305789ef7 (diff) | |
| download | Paper-0708fa363b83f2ba47d858c9bfb94ffeb11b5ba1.tar.gz Paper-0708fa363b83f2ba47d858c9bfb94ffeb11b5ba1.zip | |
Updated Upstream (CraftBukkit/Spigot)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
CraftBukkit Changes:
eb2e6578 SPIGOT-5116: Fix concurrent modification exception inside ChunkMapDistance
989f9b3d SPIGOT-4849: Fix server crash when accessing chunks during chunk load/unload/populate events
f554183c SPIGOT-5171: Don't fire PlayerTeleportEvent if not actually moving
2349feb8 SPIGOT-5163: Cancelling PlayerBucketFillEvent visually removes the targeted block
Spigot Changes:
9a643a6a Remove DataWatcher Locking
Diffstat (limited to 'Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch')
| -rw-r--r-- | Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch index 81237ba97f..68d529c5de 100644 --- a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch +++ b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch @@ -1,11 +1,11 @@ -From 124f2ebcda485739ff4e7772dc5dfc8bdb680d42 Mon Sep 17 00:00:00 2001 +From ed171c8fbb759e34cb7970a7a668b9d032c0c853 Mon Sep 17 00:00:00 2001 From: Byteflux <[email protected]> Date: Tue, 1 Mar 2016 14:14:15 -0600 Subject: [PATCH] Drop falling block and tnt entities at the specified height diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 3f734327c0..1ed58f4bba 100644 +index 3f734327c..1ed58f4bb 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -114,4 +114,14 @@ public class PaperWorldConfig { @@ -24,10 +24,10 @@ index 3f734327c0..1ed58f4bba 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 49f64e1507..187374666b 100644 +index 43abdf41f..716892c72 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1837,6 +1837,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -1838,6 +1838,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke return this.a(itemstack, 0.0F); } @@ -36,7 +36,7 @@ index 49f64e1507..187374666b 100644 public EntityItem a(ItemStack itemstack, float f) { if (itemstack.isEmpty()) { diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index 7b7048090d..7fb0c0e068 100644 +index 7b7048090..7fb0c0e06 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -88,6 +88,16 @@ public class EntityFallingBlock extends Entity { @@ -57,7 +57,7 @@ index 7b7048090d..7fb0c0e068 100644 blockposition = new BlockPosition(this); boolean flag = this.block.getBlock() instanceof BlockConcretePowder; diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index 775192a598..e988abd67c 100644 +index 775192a59..e988abd67 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java @@ -57,6 +57,11 @@ public class EntityTNTPrimed extends Entity { |