aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
diff options
context:
space:
mode:
authorShane Freeder <[email protected]>2019-04-23 05:47:07 +0100
committerShane Freeder <[email protected]>2019-04-23 10:35:52 +0100
commit6c3f04049d7a50408fa377b0ec36e47c9348dfeb (patch)
tree852f0e242997a2afcbd6e49573ece7a049ed98ac /Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
parentfb25dc17c62acce335346d5e96899257ae7230c7 (diff)
downloadPaper-6c3f04049d7a50408fa377b0ec36e47c9348dfeb.tar.gz
Paper-6c3f04049d7a50408fa377b0ec36e47c9348dfeb.zip
Initial work on 1.14 pre-5
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.patch8
1 files changed, 4 insertions, 4 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 7cc973fdb2..d656694c9f 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,4 +1,4 @@
-From 320dd5815173fe4d72fc4cdf0477f3fb46b9e86c Mon Sep 17 00:00:00 2001
+From 7b97269d9fb6b8c56c684946f4f85a3fe07d8b6f 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
@@ -24,7 +24,7 @@ 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 e329c2f48a..2b4a784e4d 100644
+index 131946154e..2198182ec9 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1879,6 +1879,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -58,7 +58,7 @@ index 4e4c8cc501..a6eae266de 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 3977498c4b..5dc52b6b89 100644
+index e3a03782c8..8c19278f37 100644
--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
+++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
@@ -57,6 +57,13 @@ public class EntityTNTPrimed extends Entity {
@@ -76,5 +76,5 @@ index 3977498c4b..5dc52b6b89 100644
this.motY *= 0.9800000190734863D;
this.motZ *= 0.9800000190734863D;
--
-2.20.1
+2.21.0