2019-07-05 02:13:38 +00:00
|
|
|
From baba0544534dd230dfbaa893c0c0ccb436b17b79 Mon Sep 17 00:00:00 2001
|
2017-05-14 18:05:01 +00: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-07-05 02:13:38 +00:00
|
|
|
index 134c4f7a36..241149c9f2 100644
|
2017-05-14 18:05:01 +00: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;
|
|
|
|
|
2019-07-03 20:44:07 +00:00
|
|
|
@@ -282,4 +281,14 @@ public class PaperWorldConfig {
|
2017-05-14 18:05:01 +00: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-07-05 02:13:38 +00:00
|
|
|
index 15e7bfc47b..579d15b45e 100644
|
2017-05-14 18:05:01 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2019-07-05 02:13:38 +00:00
|
|
|
@@ -2697,6 +2697,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2018-07-16 15:34:55 +00:00
|
|
|
}
|
|
|
|
|
2019-06-25 01:47:58 +00:00
|
|
|
public boolean bE() {
|
2019-04-27 06:26:04 +00:00
|
|
|
+ // Paper start
|
2017-05-14 18:05:01 +00: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-07-05 02:13:38 +00:00
|
|
|
index f2ee53ab90..dc0d944ea0 100644
|
2017-05-14 18:05:01 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
|
2019-05-12 23:42:49 +00:00
|
|
|
@@ -80,7 +80,27 @@ public class EntityTNTPrimed extends Entity {
|
2019-06-25 01:47:58 +00:00
|
|
|
this.ay();
|
2019-05-12 23:42:49 +00:00
|
|
|
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 18:05:01 +00: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.
|
2019-05-12 23:42:49 +00:00
|
|
|
+ PlayerChunkMap.EntityTracker ete = this.tracker;
|
2017-05-14 18:05:01 +00:00
|
|
|
+ if (ete != null) {
|
|
|
|
+ PacketPlayOutEntityVelocity velocityPacket = new PacketPlayOutEntityVelocity(this);
|
|
|
|
+ PacketPlayOutEntityTeleport positionPacket = new PacketPlayOutEntityTeleport(this);
|
|
|
|
+
|
2017-05-15 15:28:28 +00:00
|
|
|
+ ete.trackedPlayers.stream()
|
2019-05-12 23:42:49 +00: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 18:05:01 +00:00
|
|
|
+ }
|
|
|
|
+ }
|
2019-05-12 23:42:49 +00:00
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
|
|
|
private void explode() {
|
|
|
|
@@ -149,4 +169,11 @@ public class EntityTNTPrimed extends Entity {
|
|
|
|
public Packet<?> N() {
|
|
|
|
return new PacketPlayOutSpawnEntity(this);
|
|
|
|
}
|
2017-05-14 18:05:01 +00:00
|
|
|
+
|
2019-05-12 23:42:49 +00:00
|
|
|
+ // Paper start - Optional prevent TNT from moving in water
|
|
|
|
+ @Override
|
|
|
|
+ public boolean pushedByWater() {
|
|
|
|
+ return !world.paperConfig.preventTntFromMovingInWater && super.pushedByWater();
|
2017-05-14 18:05:01 +00:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|
2019-05-06 00:57:14 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
2019-07-05 02:13:38 +00:00
|
|
|
index f04a9d18c4..cd7e0299ac 100644
|
2019-05-06 00:57:14 +00: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 18:05:01 +00:00
|
|
|
--
|
2019-06-25 01:47:58 +00:00
|
|
|
2.22.0
|
2017-05-14 18:05:01 +00:00
|
|
|
|