Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-29 22:13:42 +01:00
Code Issues Projects Releases Wiki Activity

Fix TNTPrimed head hight calculation

Browse Source 
Fixes GH-370
This commit is contained in:
Zach Brown 2016-07-19 18:48:08 -05:00
parent 11fabc9552
commit 4a551284a5
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0152-Optional-old-TNT-cannon-behaviors.patch
View File

@ -1,4 +1,4 @@
From 1c549e3bb8a05d3e9af84f9af79ebebab8713633 Mon Sep 17 00:00:00 2001 From f4843a279527a5ea8ccaedcdf1de0b6ca2c30a02 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 22 May 2016 20:20:55 -0500 Date: Sun, 22 May 2016 20:20:55 -0500
Subject: [PATCH] Optional old TNT cannon behaviors Subject: [PATCH] Optional old TNT cannon behaviors
@ -288,7 +288,7 @@ index a1392d6..4fd4371 100644
+ // Paper end + // Paper end
} }
diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
index 86f3f1f..3f4e21d 100644 index 86f3f1f..9a25219 100644
--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
+++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
@@ -30,6 +30,7 @@ public class EntityTNTPrimed extends Entity { @@ -30,6 +30,7 @@ public class EntityTNTPrimed extends Entity {
@ -304,7 +304,7 @@ index 86f3f1f..3f4e21d 100644
public float getHeadHeight() { public float getHeadHeight() {
- return 0.0F; - return 0.0F;
+ return world.paperConfig.oldCannonBehaviors ? this.length / 2 : 0.0F; // Paper - Old TNT cannon behaviors + return world.paperConfig.oldCannonBehaviors ? this.length / 16F : 0.0F; // Paper - Old TNT cannon behaviors
} }
public void setFuseTicks(int i) { public void setFuseTicks(int i) {
@ -391,5 +391,5 @@ index 6cdc3a3..0b9bc91 100644
EntityHuman entityhuman = (EntityHuman) entity; EntityHuman entityhuman = (EntityHuman) entity;
-- --
2.9.0 2.9.2.windows.1