Remove giant TNT changes patch
This commit is contained in:
@@ -48,3 +48,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ // PaperSpigot end
|
+ // PaperSpigot end
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
|
1.9.5.msysgit.1
|
||||||
|
|
||||||
|
|||||||
@@ -141,3 +141,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ // PaperSpigot end
|
+ // PaperSpigot end
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
|
1.9.5.msysgit.1
|
||||||
|
|
||||||
|
|||||||
@@ -41,3 +41,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ // PaperSpigot end
|
+ // PaperSpigot end
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
|
1.9.5.msysgit.1
|
||||||
|
|
||||||
|
|||||||
@@ -25,3 +25,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
|| entity instanceof EntityFireworks )
|
|| entity instanceof EntityFireworks )
|
||||||
{
|
{
|
||||||
--
|
--
|
||||||
|
1.9.5.msysgit.1
|
||||||
|
|
||||||
|
|||||||
@@ -18,3 +18,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
|
file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
|
||||||
if ( file.exists() )
|
if ( file.exists() )
|
||||||
--
|
--
|
||||||
|
1.9.5.msysgit.1
|
||||||
|
|
||||||
|
|||||||
@@ -349,3 +349,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
|
1.9.5.msysgit.1
|
||||||
|
|
||||||
|
|||||||
@@ -89,3 +89,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
|
1.9.5.msysgit.1
|
||||||
|
|
||||||
|
|||||||
@@ -17,3 +17,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
<manifestEntries>
|
<manifestEntries>
|
||||||
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
|
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
|
||||||
--
|
--
|
||||||
|
1.9.5.msysgit.1
|
||||||
|
|
||||||
|
|||||||
@@ -58,8 +58,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
||||||
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
||||||
@@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig
|
@@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig
|
||||||
System.err.println( "==========================================" );
|
{
|
||||||
}
|
netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
|
||||||
}
|
}
|
||||||
+
|
+
|
||||||
+ public int tickNextTickCap;
|
+ public int tickNextTickCap;
|
||||||
@@ -73,3 +73,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
|
1.9.5.msysgit.1
|
||||||
|
|
||||||
|
|||||||
@@ -83,25 +83,26 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
this.lastY = this.locY;
|
this.lastY = this.locY;
|
||||||
this.lastZ = this.locZ;
|
this.lastZ = this.locZ;
|
||||||
@@ -0,0 +0,0 @@ public class EntityTNTPrimed extends Entity {
|
@@ -0,0 +0,0 @@ public class EntityTNTPrimed extends Entity {
|
||||||
locY += this.length / 2.0F;
|
server.getPluginManager().callEvent(event);
|
||||||
}
|
|
||||||
|
|
||||||
- this.world.createExplosion(this, this.locX, locY, this.locZ, event.getRadius(), event.getFire(), true);
|
if (!event.isCancelled()) {
|
||||||
|
- this.world.createExplosion(this, this.locX, this.locY + (double) (this.length / 2.0F), this.locZ, event.getRadius(), event.getFire(), true);
|
||||||
+ // PaperSpigot start - Force load chunks for specific entities that fly through
|
+ // PaperSpigot start - Force load chunks for specific entities that fly through
|
||||||
+ if (world.paperSpigotConfig.loadUnloadedTNTEntities) {
|
+ if (world.paperSpigotConfig.loadUnloadedTNTEntities) {
|
||||||
+ ChunkProviderServer chunkProvider = (ChunkProviderServer) world.chunkProvider;
|
+ ChunkProviderServer chunkProvider = (ChunkProviderServer) world.chunkProvider;
|
||||||
+ boolean before = chunkProvider.forceChunkLoad;
|
+ boolean before = chunkProvider.forceChunkLoad;
|
||||||
+ chunkProvider.forceChunkLoad = true;
|
+ chunkProvider.forceChunkLoad = true;
|
||||||
+
|
+
|
||||||
+ this.world.createExplosion(this, this.locX, locY, this.locZ, event.getRadius(), event.getFire(), true);
|
+ this.world.createExplosion(this, this.locX, this.locY + (double) (this.length / 2.0F), this.locZ, event.getRadius(), event.getFire(), true);
|
||||||
+
|
+
|
||||||
+ chunkProvider.forceChunkLoad = before;
|
+ chunkProvider.forceChunkLoad = before;
|
||||||
+ } else {
|
+ } else {
|
||||||
+ this.world.createExplosion(this, this.locX, locY, this.locZ, event.getRadius(), event.getFire(), true);
|
+ this.world.createExplosion(this, this.locX, this.locY + (double) (this.length / 2.0F), this.locZ, event.getRadius(), event.getFire(), true);
|
||||||
+ }
|
+ }
|
||||||
// PaperSpigot end
|
+ // PaperSpigot end
|
||||||
}
|
}
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -168,3 +169,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
|
1.9.5.msysgit.1
|
||||||
|
|
||||||
|
|||||||
@@ -44,3 +44,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
|
1.9.5.msysgit.1
|
||||||
|
|
||||||
|
|||||||
@@ -1,109 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
|
|
||||||
Date: Sun, 8 Mar 2015 04:52:37 -0500
|
|
||||||
Subject: [PATCH] PaperSpigot TNT Changes
|
|
||||||
|
|
||||||
PaperSpigot communal TNT modification patch
|
|
||||||
Original authors for individual changes are listed w/in PaperSpigotWorldConfig
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
|
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
||||||
--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
|
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
|
|
||||||
@@ -0,0 +0,0 @@ public class EntityTNTPrimed extends Entity {
|
|
||||||
this.lastY = d1;
|
|
||||||
this.lastZ = d2;
|
|
||||||
this.source = entityliving;
|
|
||||||
+
|
|
||||||
+ // PaperSpigot start - Fix TNT directional bias
|
|
||||||
+ if (this.world.paperSpigotConfig.fixTNTDirectionBias) {
|
|
||||||
+ this.motX = this.motZ = 0;
|
|
||||||
+ }
|
|
||||||
+ // PaperSpigot end
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void h() {}
|
|
||||||
@@ -0,0 +0,0 @@ public class EntityTNTPrimed extends Entity {
|
|
||||||
}
|
|
||||||
// PaperSpigot end
|
|
||||||
|
|
||||||
+ // PaperSpigot start - Configurable TNT Height Limit
|
|
||||||
+ if (this.world.paperSpigotConfig.tntHeightLimit != 0 && this.locY > this.world.paperSpigotConfig.tntHeightLimit) {
|
|
||||||
+ this.die();
|
|
||||||
+ }
|
|
||||||
+ // PaperSpigot end
|
|
||||||
+
|
|
||||||
this.motX *= 0.9800000190734863D;
|
|
||||||
this.motY *= 0.9800000190734863D;
|
|
||||||
this.motZ *= 0.9800000190734863D;
|
|
||||||
@@ -0,0 +0,0 @@ public class EntityTNTPrimed extends Entity {
|
|
||||||
server.getPluginManager().callEvent(event);
|
|
||||||
|
|
||||||
if (!event.isCancelled()) {
|
|
||||||
- this.world.createExplosion(this, this.locX, this.locY + (double) (this.length / 2.0F), this.locZ, event.getRadius(), event.getFire(), true);
|
|
||||||
+ // PaperSpigot start - Configurable legacy TNT explosion height
|
|
||||||
+ double locY = this.locY;
|
|
||||||
+
|
|
||||||
+ if (!this.world.paperSpigotConfig.legacyTNTExplosionHeight) {
|
|
||||||
+ locY += this.length / 2.0F;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ this.world.createExplosion(this, this.locX, locY, this.locZ, event.getRadius(), event.getFire(), true);
|
|
||||||
+ // PaperSpigot end
|
|
||||||
}
|
|
||||||
// CraftBukkit end
|
|
||||||
}
|
|
||||||
@@ -0,0 +0,0 @@ public class EntityTNTPrimed extends Entity {
|
|
||||||
public float getHeadHeight() {
|
|
||||||
return 0.0F;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * PaperSpigot - Configurable TNT water movement
|
|
||||||
+ */
|
|
||||||
+ @Override
|
|
||||||
+ public boolean aL() {
|
|
||||||
+ return world.paperSpigotConfig.tntMovesInWater;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
||||||
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
||||||
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
||||||
@@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig
|
|
||||||
{
|
|
||||||
netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ public boolean fixTNTDirectionBias;
|
|
||||||
+ public boolean tntMovesInWater;
|
|
||||||
+ public boolean legacyTNTExplosionHeight;
|
|
||||||
+ public int tntHeightLimit;
|
|
||||||
+ private void tntChanges()
|
|
||||||
+ {
|
|
||||||
+ // Original Authors: Iceee <andrew@opticgaming.tv>
|
|
||||||
+ fixTNTDirectionBias = getBoolean( "tnt-gameplay.fix-directional-bias", false );
|
|
||||||
+ // Original Author: Byteflux <byte@byteflux.net>
|
|
||||||
+ tntMovesInWater = getBoolean( "tnt-gameplay.moves-in-water", true );
|
|
||||||
+ // Original Author: Byteflux <byte@byteflux.net>
|
|
||||||
+ legacyTNTExplosionHeight = getBoolean( "tnt-gameplay.legacy-explosion-height", false );
|
|
||||||
+ // Original Author: Somebody \o/
|
|
||||||
+ tntHeightLimit = getInt( "tnt-gameplay.tnt-entity-height-limit", 0 );
|
|
||||||
+
|
|
||||||
+ log( "Fix TNT directional bias: " + fixTNTDirectionBias );
|
|
||||||
+ log( "TNT moves in water: " + tntMovesInWater );
|
|
||||||
+ log( "Use legacy TNT explosion height " + legacyTNTExplosionHeight );
|
|
||||||
+ if ( tntHeightLimit != 0 ) {
|
|
||||||
+ log( "TNT height limit set at " + tntHeightLimit );
|
|
||||||
+ } else {
|
|
||||||
+ log( "TNT height limit disabled" );
|
|
||||||
+ }
|
|
||||||
+ if (PaperSpigotConfig.version < 7) {
|
|
||||||
+ System.err.println( "==========================================" );
|
|
||||||
+ System.err.println( " Many TNT Related Settings Have Moved " );
|
|
||||||
+ System.err.println( " Please check your config in paper.yml! " );
|
|
||||||
+ System.err.println( "==========================================" );
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
--
|
|
||||||
@@ -97,3 +97,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
}
|
}
|
||||||
|
|
||||||
--
|
--
|
||||||
|
1.9.5.msysgit.1
|
||||||
|
|
||||||
|
|||||||
@@ -34,3 +34,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
|
|
||||||
public boolean netherVoidTopDamage;
|
public boolean netherVoidTopDamage;
|
||||||
--
|
--
|
||||||
|
1.9.5.msysgit.1
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user