Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Re-introduce an option to limit the height of a flying tnt entity

Browse Source
This commit is contained in:
Zach Brown
2016-01-16 21:04:07 -06:00
parent 56c14f8f07
commit a26fef50ef
30 changed files with 206 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0030-Add-TNT-source-location-API.patch
View File

@@ -1,4 +1,4 @@
From ec281d8d7494f7338e01f25c7b256b74862383ca Mon Sep 17 00:00:00 2001
From caf326d2691e94f197820555136aac73ef7cee29 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 8 Mar 2015 04:23:41 -0500
Subject: [PATCH] Add TNT source location API
@@ -42,7 +42,7 @@ index f2c78f3..bc07d3d 100644
world.addEntity(entitytntprimed);
diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
index 50423eb..1daba4e 100644
index 2eeea05..7f82c4a 100644
--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
+++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
@@ -8,15 +8,23 @@ public class EntityTNTPrimed extends Entity {
@@ -71,7 +71,7 @@ index 50423eb..1daba4e 100644
this.setPosition(d0, d1, d2);
float f = (float) (Math.random() * 3.1415927410125732D * 2.0D);
@@ -96,10 +104,25 @@ public class EntityTNTPrimed extends Entity {
@@ -102,10 +110,25 @@ public class EntityTNTPrimed extends Entity {
protected void b(NBTTagCompound nbttagcompound) {
nbttagcompound.setByte("Fuse", (byte) this.fuseTicks);
@@ -98,7 +98,7 @@ index 50423eb..1daba4e 100644
public EntityLiving getSource() {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 552f5c3..05b88fd 100644
index 89e78ab..d8417c9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1110,7 +1110,8 @@ public class CraftWorld implements World {
@@ -128,5 +128,5 @@ index e08ad47..b7e8b4d 100644
+ // PaperSpigot end
}
--
2.5.2
2.7.0