OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 17:01:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

oops

Browse source
This commit is contained in:
Noah van der Aa 2024-10-22 20:09:28 +02:00
parent 9ece54ccdd
commit 8e550effe8
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
patches/server/Optional-TNT-doesn-t-move-in-water.patch
View file

@ -8,17 +8,6 @@ diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
+++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
@@ -0,0 +0,0 @@ public class PrimedTnt extends Entity implements TraceableEntity {
@Override
public void tick() {
- if (this.level().spigotConfig.maxTntTicksPerTick > 0 && ++this.level().spigotConfig.currentPrimedTnt > this.level().spigotConfig.maxTntTicksPerTick) { return; } // Spigot
+ if (this.level().spigotConfig.maxTntTicksPerTick > 0 && ++this.level().spigotConfig.currentPrimedTnt > this.level().spigotConfig.maxTntTicksPerTick) {
+ return;
+ } // Spigot
this.handlePortal();
this.applyGravity();
this.move(MoverType.SELF, this.getDeltaMovement());
@@ -0,0 +0,0 @@ public class PrimedTnt extends Entity implements TraceableEntity { @@ -0,0 +0,0 @@ public class PrimedTnt extends Entity implements TraceableEntity {
} }
} }
@ -48,15 +37,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
private void explode() { private void explode() {
@@ -0,0 +0,0 @@ public class PrimedTnt extends Entity implements TraceableEntity { @@ -0,0 +0,0 @@ public class PrimedTnt extends Entity implements TraceableEntity {
return entity; public final boolean hurtServer(ServerLevel world, DamageSource source, float amount) {
return false;
} }
+
+ // Paper start - Option to prevent TNT from moving in water + // Paper start - Option to prevent TNT from moving in water
@Override + @Override
- public final boolean hurtServer(ServerLevel world, DamageSource source, float amount) {
- return false;
+ public boolean isPushedByFluid() { + public boolean isPushedByFluid() {
+ return !level().paperConfig().fixes.preventTntFromMovingInWater && super.isPushedByFluid(); + return !level().paperConfig().fixes.preventTntFromMovingInWater && super.isPushedByFluid();
} + }
+ // Paper end - Option to prevent TNT from moving in water + // Paper end - Option to prevent TNT from moving in water
} }