Paper/patches/server/0099-Optional-TNT-doesn-t-move-in-water.patch

51 lines
2.6 KiB
Diff
Raw Normal View History

2021-06-12 07:20:08 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
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/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
2024-06-13 19:30:39 +02:00
index 15432b512fc0d0d38bf28499e2afa5e48fec7aaa..47f2a480f6a4b15e55cedbfa8a58459d33516a97 100644
2021-06-12 07:20:08 +02:00
--- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
+++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
2024-06-13 19:30:39 +02:00
@@ -128,6 +128,27 @@ public class PrimedTnt extends Entity implements TraceableEntity {
2021-06-12 07:20:08 +02:00
}
}
+ // Paper start - Option to prevent TNT from moving in water
2023-06-08 00:28:06 +02:00
+ if (!this.isRemoved() && this.wasTouchingWater && this.level().paperConfig().fixes.preventTntFromMovingInWater) {
2021-06-12 07:20:08 +02:00
+ /*
+ * Author: Jedediah Smith <jedediah@silencegreys.com>
+ */
+ // 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.
2023-06-08 00:28:06 +02:00
+ net.minecraft.server.level.ChunkMap.TrackedEntity ete = ((net.minecraft.server.level.ServerLevel)this.level()).getChunkSource().chunkMap.entityMap.get(this.getId());
2021-06-12 07:20:08 +02:00
+ if (ete != null) {
+ net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket velocityPacket = new net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket(this);
+ net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket positionPacket = new net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket(this);
+
+ ete.seenBy.stream()
+ .filter(viewer -> (viewer.getPlayer().getX() - this.getX()) * (viewer.getPlayer().getY() - this.getY()) * (viewer.getPlayer().getZ() - this.getZ()) < 16 * 16)
+ .forEach(viewer -> {
+ viewer.send(velocityPacket);
+ viewer.send(positionPacket);
+ });
+ }
+ }
+ // Paper end - Option to prevent TNT from moving in water
2021-06-12 07:20:08 +02:00
}
private void explode() {
2024-06-13 19:30:39 +02:00
@@ -202,4 +223,11 @@ public class PrimedTnt extends Entity implements TraceableEntity {
return entity;
2021-06-12 07:20:08 +02:00
}
+
+ // Paper start - Option to prevent TNT from moving in water
2021-06-12 07:20:08 +02:00
+ @Override
+ public boolean isPushedByFluid() {
+ return !level().paperConfig().fixes.preventTntFromMovingInWater && super.isPushedByFluid();
2021-06-12 07:20:08 +02:00
+ }
+ // Paper end - Option to prevent TNT from moving in water
2021-06-12 07:20:08 +02:00
}