Paper/Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch

112 lines
4.5 KiB
Diff
Raw Normal View History

2019-12-12 19:45:00 +01:00
From 1eafa5490facbe5bf35b93d62c88f1fd38e0939a Mon Sep 17 00:00:00 2001
2017-05-14 20:05:01 +02:00
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 22 May 2016 20:20:55 -0500
Subject: [PATCH] Optional TNT doesn't move in water
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
2019-12-12 00:43:22 +01:00
index 277f7618e..1dbeb209e 100644
2017-05-14 20:05:01 +02:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -2,7 +2,6 @@ package com.destroystokyo.paper;
import java.util.List;
-import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration;
import org.spigotmc.SpigotWorldConfig;
@@ -287,4 +286,14 @@ public class PaperWorldConfig {
2017-05-14 20:05:01 +02:00
);
}
}
+
+ public boolean preventTntFromMovingInWater;
+ private void preventTntFromMovingInWater() {
+ if (PaperConfig.version < 13) {
+ boolean oldVal = getBoolean("enable-old-tnt-cannon-behaviors", false);
+ set("prevent-tnt-from-moving-in-water", oldVal);
+ }
+ preventTntFromMovingInWater = getBoolean("prevent-tnt-from-moving-in-water", false);
+ log("Prevent TNT from moving in water: " + preventTntFromMovingInWater);
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
2019-12-12 00:43:22 +01:00
index 2e56c7f57..e04b3f4e2 100644
2017-05-14 20:05:01 +02:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
2019-12-12 00:43:22 +01:00
@@ -2705,6 +2705,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
2019-12-12 00:43:22 +01:00
public boolean bM() {
2019-04-27 08:26:04 +02:00
+ // Paper start
2017-05-14 20:05:01 +02:00
+ return this.pushedByWater();
+ }
+
+ public boolean pushedByWater() {
+ // Paper end
return true;
}
diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
2019-12-12 19:45:00 +01:00
index 346315acb..d3b2075f2 100644
2017-05-14 20:05:01 +02:00
--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
+++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
2019-12-12 00:43:22 +01:00
@@ -79,7 +79,27 @@ public class EntityTNTPrimed extends Entity {
this.world.addParticle(Particles.SMOKE, this.locX(), this.locY() + 0.5D, this.locZ(), 0.0D, 0.0D, 0.0D);
}
}
-
+ // Paper start - Optional prevent TNT from moving in water
+ if (!this.dead && this.inWater && this.world.paperConfig.preventTntFromMovingInWater) {
+ /*
+ * Author: Jedediah Smith <jedediah@silencegreys.com>
+ */
2017-05-14 20:05:01 +02:00
+ // Send position and velocity updates to nearby players on every tick while the TNT is in water.
+ // This does pretty well at keeping their clients in sync with the server.
+ PlayerChunkMap.EntityTracker ete = this.tracker;
2017-05-14 20:05:01 +02:00
+ if (ete != null) {
+ PacketPlayOutEntityVelocity velocityPacket = new PacketPlayOutEntityVelocity(this);
+ PacketPlayOutEntityTeleport positionPacket = new PacketPlayOutEntityTeleport(this);
+
+ ete.trackedPlayers.stream()
2019-12-12 19:45:00 +01:00
+ .filter(viewer -> (viewer.locX() - this.locX()) * (viewer.locY() - this.locY()) * (viewer.locZ() - this.locZ()) < 16 * 16)
+ .forEach(viewer -> {
+ viewer.playerConnection.sendPacket(velocityPacket);
+ viewer.playerConnection.sendPacket(positionPacket);
+ });
2017-05-14 20:05:01 +02:00
+ }
+ }
+ // Paper end
}
private void explode() {
2019-12-12 00:43:22 +01:00
@@ -148,4 +168,11 @@ public class EntityTNTPrimed extends Entity {
public Packet<?> L() {
return new PacketPlayOutSpawnEntity(this);
}
2017-05-14 20:05:01 +02:00
+
+ // Paper start - Optional prevent TNT from moving in water
+ @Override
+ public boolean pushedByWater() {
+ return !world.paperConfig.preventTntFromMovingInWater && super.pushedByWater();
2017-05-14 20:05:01 +02:00
+ }
+ // Paper end
}
2019-05-06 02:57:14 +02:00
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
2019-12-12 00:43:22 +01:00
index a13fd9b34..3ff7a7b4a 100644
2019-05-06 02:57:14 +02:00
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -36,7 +36,7 @@ public class EntityTrackerEntry {
private boolean q;
private boolean r;
// CraftBukkit start
- private final Set<EntityPlayer> trackedPlayers;
+ final Set<EntityPlayer> trackedPlayers; // Paper - private -> package
// Paper start
private java.util.Map<EntityPlayer, Boolean> trackedPlayerMap = null;
2017-05-14 20:05:01 +02:00
--
2019-12-12 00:43:22 +01:00
2.17.1
2017-05-14 20:05:01 +02:00