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

75 lines
3.7 KiB
Diff
Raw Normal View History

2018-07-20 19:57:43 +00:00
From 615504d69426ef74c5f9e55af1daaa5e37221abd Mon Sep 17 00:00:00 2001
2016-02-29 23:09:49 +00: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
2018-07-20 19:57:43 +00:00
index 3626aa717d..be92c1af60 100644
2016-02-29 23:09:49 +00:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -147,4 +147,9 @@ public class PaperWorldConfig {
optimizeExplosions = getBoolean("optimize-explosions", false);
log("Optimize explosions: " + optimizeExplosions);
2016-02-29 23:09:49 +00: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
2018-07-20 19:57:43 +00:00
index d7a8a82a6a..18dd06980f 100644
2016-02-29 23:09:49 +00:00
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
2018-07-20 19:57:43 +00:00
@@ -1002,6 +1002,7 @@ public abstract class EntityLiving extends Entity {
2016-02-29 23:09:49 +00: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);
2018-07-20 19:57:43 +00:00
@@ -1018,6 +1019,7 @@ public abstract class EntityLiving extends Entity {
2017-05-14 18:05:01 +00:00
b0 = 2;
}
2016-02-29 23:09:49 +00:00
+ if (!knockbackCancelled) // Paper - Disable explosion knockback
2017-05-14 18:05:01 +00:00
this.world.broadcastEntityEffect(this, b0);
2016-02-29 23:09:49 +00:00
}
2018-07-20 19:57:43 +00:00
@@ -1041,6 +1043,8 @@ public abstract class EntityLiving extends Entity {
2016-02-29 23:09:49 +00:00
}
}
+ if (knockbackCancelled) this.world.broadcastEntityEffect(this, (byte) 2); // Paper - Disable explosion knockback
+
if (this.getHealth() <= 0.0F) {
2017-05-14 18:05:01 +00:00
if (!this.e(damagesource)) {
SoundEffect soundeffect = this.cr();
2016-02-29 23:09:49 +00:00
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
2018-07-20 19:57:43 +00:00
index 8fdcd52b2f..75b21010b8 100644
2016-02-29 23:09:49 +00:00
--- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -152,7 +152,7 @@ public class Explosion {
2016-11-17 02:23:38 +00:00
double d14 = d13;
2016-02-29 23:09:49 +00: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
}
entity.motX += d8 * d14;
@@ -161,7 +161,7 @@ public class Explosion {
2016-02-29 23:09:49 +00:00
if (entity instanceof EntityHuman) {
EntityHuman entityhuman = (EntityHuman) entity;
- if (!entityhuman.isSpectator() && (!entityhuman.u() || !entityhuman.abilities.isFlying)) {
+ if (!entityhuman.isSpectator() && (!entityhuman.u() && !world.paperConfig.disableExplosionKnockback || !entityhuman.abilities.isFlying)) { // Paper - Disable explosion knockback
this.l.put(entityhuman, new Vec3D(d8 * d13, d9 * d13, d10 * d13));
2016-02-29 23:09:49 +00:00
}
}
--
2.18.0
2016-02-29 23:09:49 +00:00