Paper/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch

70 lines
3.8 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2016-03-01 00:09:49 +01:00
From: Sudzzy <originmc@outlook.com>
Date: Wed, 2 Mar 2016 14:48:03 -0600
Subject: [PATCH] Disable explosion knockback
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index f038d3f7dc7d1034a3ee9f2384a85642f224836e..25e0717186366af580e512eedfd403b8efc64a75 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -156,4 +156,9 @@ public class PaperWorldConfig {
optimizeExplosions = getBoolean("optimize-explosions", false);
log("Optimize explosions: " + optimizeExplosions);
2016-03-01 00:09:49 +01:00
}
+
+ public boolean disableExplosionKnockback;
+ private void disableExplosionKnockback(){
+ disableExplosionKnockback = getBoolean("disable-explosion-knockback", false);
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 6f9fe8959e7ca47effead4ab2a59c75d4781eb00..0b05cc912a70ed1aaa70e9a66d789e95c78c5fc1 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1184,6 +1184,7 @@ public abstract class EntityLiving extends Entity {
2016-03-01 00:09:49 +01:00
}
}
2016-03-01 00:09:49 +01:00
2020-06-25 11:27:25 +02:00
+ boolean knockbackCancelled = world.paperConfig.disableExplosionKnockback && damagesource.isExplosion() && this instanceof EntityHuman; // Paper - Disable explosion knockback
if (flag1) {
if (flag) {
this.world.broadcastEntityEffect(this, (byte) 29);
@@ -1202,6 +1203,7 @@ public abstract class EntityLiving extends Entity {
b0 = 2;
}
2017-05-14 20:05:01 +02:00
2020-06-25 11:27:25 +02:00
+ if (!knockbackCancelled) // Paper - Disable explosion knockback
this.world.broadcastEntityEffect(this, b0);
}
2016-03-01 00:09:49 +01:00
@@ -1225,6 +1227,7 @@ public abstract class EntityLiving extends Entity {
2016-03-01 00:09:49 +01:00
}
}
2016-03-01 00:09:49 +01:00
2020-06-25 11:27:25 +02:00
+ if (knockbackCancelled) this.world.broadcastEntityEffect(this, (byte) 2); // Paper - Disable explosion knockback
if (this.dk()) {
2019-04-25 08:53:51 +02:00
if (!this.f(damagesource)) {
SoundEffect soundeffect = this.getSoundDeath();
2016-03-01 00:09:49 +01:00
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
index 88d2fa33e4c9f90f2aa80b3afbf28edbdbeb03db..b7d635ca2cbe9bf7e2e3a2ae5fa7a20f39dd913b 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -189,14 +189,14 @@ public class Explosion {
2016-11-17 03:23:38 +01:00
double d14 = d13;
2016-03-01 00:09:49 +01:00
if (entity instanceof EntityLiving) {
- d14 = EnchantmentProtection.a((EntityLiving) entity, d13);
+ d14 = entity instanceof EntityHuman && world.paperConfig.disableExplosionKnockback ? 0 : EnchantmentProtection.a((EntityLiving) entity, d13); // Paper - Disable explosion knockback
}
2019-04-25 08:53:51 +02:00
entity.setMot(entity.getMot().add(d8 * d14, d9 * d14, d10 * d14));
2016-03-01 00:09:49 +01:00
if (entity instanceof EntityHuman) {
EntityHuman entityhuman = (EntityHuman) entity;
2019-04-25 08:53:51 +02:00
- if (!entityhuman.isSpectator() && (!entityhuman.isCreative() || !entityhuman.abilities.isFlying)) {
2020-06-25 11:27:25 +02:00
+ if (!entityhuman.isSpectator() && (!entityhuman.isCreative() || !entityhuman.abilities.isFlying) && !world.paperConfig.disableExplosionKnockback) { // Paper - Disable explosion knockback
this.n.put(entityhuman, new Vec3D(d8 * d13, d9 * d13, d10 * d13));
2016-03-01 00:09:49 +01:00
}
}