From 6d9962a0cf301943ff52739267c5c4435fad6fa4 Mon Sep 17 00:00:00 2001 From: Zach Brown 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 index a3823408ca..41e73b3409 100644 --- 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; @@ -276,4 +275,14 @@ public class PaperWorldConfig { ); } } + + 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 index 428eaca37a..964caa080c 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1173,6 +1173,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke } public boolean aq() { + // Paper start + return this.doWaterMovement(); + } + + public boolean doWaterMovement() { + // Paper end return this.isInWater() || this.q(); } @@ -2726,6 +2732,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke } public boolean bw() { + 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 index 87f3205f82..8c1d25979f 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java @@ -147,4 +147,49 @@ public class EntityTNTPrimed extends Entity { public int getFuseTicks() { return this.c; } + + // Paper start - Optional prevent TNT from moving in water + @Override + public boolean pushedByWater() { + return !world.paperConfig.preventTntFromMovingInWater && super.pushedByWater(); + } + + /** + * Author: Jedediah Smith + */ + @Override + public boolean doWaterMovement() { + if (!world.paperConfig.preventTntFromMovingInWater) return super.doWaterMovement(); + + // Preserve velocity while calling the super method + double oldMotX = this.motX; + double oldMotY = this.motY; + double oldMotZ = this.motZ; + + super.doWaterMovement(); + + this.motX = oldMotX; + this.motY = oldMotY; + this.motZ = oldMotZ; + + if (this.inWater) { + // 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. + EntityTrackerEntry ete = ((WorldServer) this.getWorld()).getTracker().trackedEntities.get(this.getId()); + if (ete != null) { + PacketPlayOutEntityVelocity velocityPacket = new PacketPlayOutEntityVelocity(this); + PacketPlayOutEntityTeleport positionPacket = new PacketPlayOutEntityTeleport(this); + + ete.trackedPlayers.stream() + .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); + }); + } + } + + return this.inWater; + } + // Paper end } -- 2.18.0