diff options
| author | Aikar <[email protected]> | 2018-07-23 20:24:44 -0400 |
|---|---|---|
| committer | Aikar <[email protected]> | 2018-07-23 20:29:55 -0400 |
| commit | 4f7a858bd63734d81bbebac98038bc4a97b1e17d (patch) | |
| tree | 43650486538690264905ab2949671db31b665360 /Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch | |
| parent | 3ad50727b93fb0c561226f72b2806fd9f859997c (diff) | |
| parent | c2d29a73aca6f5a9171947766599631dfc03a7d2 (diff) | |
| download | Paper-4f7a858bd63734d81bbebac98038bc4a97b1e17d.tar.gz Paper-4f7a858bd63734d81bbebac98038bc4a97b1e17d.zip | |
Merge pull request #1248
c2d29a73 PlayerElytraBoostEvent (BillyGalbreath)
* pull/1248/head:
PlayerElytraBoostEvent
Also merged paper config into parent
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 | 10 |
1 files changed, 5 insertions, 5 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 43a7b87e3a..c19cd34645 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,14 +1,14 @@ -From d5144d6679ef94b9546b0f81bd9dfd3bd747b6e6 Mon Sep 17 00:00:00 2001 +From 7465f3a6749b94c0f59bd6149c59a5fa7e9d7140 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 0094d1a87..4da846719 100644 +index cef0c47ac..38a697e1b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -113,4 +113,14 @@ public class PaperWorldConfig { +@@ -114,4 +114,14 @@ public class PaperWorldConfig { keepSpawnInMemory = getBoolean("keep-spawn-loaded", true); log("Keep spawn chunk loaded: " + keepSpawnInMemory); } @@ -24,7 +24,7 @@ index 0094d1a87..4da846719 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 2ed362791..20248de7e 100644 +index f1e71de42..d6cf65db6 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1885,6 +1885,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -36,7 +36,7 @@ index 2ed362791..20248de7e 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 850436d42..8d47b58c9 100644 +index e7e7d57c4..5e01aa0f8 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -86,6 +86,17 @@ public class EntityFallingBlock extends Entity { |