PaperMC/Spigot-Server-Patches/0036-Disable-explosion-knockback.patch

75 lines
3.7 KiB
Diff
Raw Normal View History

From f16a164dfccddfb47a36c363b71dd7788bcd2134 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 b0b3033e7..afc13e851 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
@@ -197,4 +197,9 @@ public class PaperWorldConfig {
2016-03-01 00:09:49 +01:00
lavaFlowSpeedNormal = getInt("lava-flow-speed.normal", 30);
lavaFlowSpeedNether = getInt("lava-flow-speed.nether", 10);
}
+
+ 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 756590ac0..05d1fc10d 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
2017-11-08 17:13:57 +01:00
@@ -906,6 +906,7 @@ public abstract class EntityLiving extends Entity {
2016-03-01 00:09:49 +01: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);
2017-11-08 17:13:57 +01:00
@@ -922,6 +923,7 @@ public abstract class EntityLiving extends Entity {
2017-05-14 20:05:01 +02:00
b0 = 2;
}
2016-03-01 00:09:49 +01:00
+ if (!knockbackCancelled) // Paper - Disable explosion knockback
2017-05-14 20:05:01 +02:00
this.world.broadcastEntityEffect(this, b0);
2016-03-01 00:09:49 +01:00
}
2017-11-08 17:13:57 +01:00
@@ -945,6 +947,8 @@ public abstract class EntityLiving extends Entity {
2016-03-01 00:09:49 +01:00
}
}
+ if (knockbackCancelled) this.world.broadcastEntityEffect(this, (byte) 2); // Paper - Disable explosion knockback
+
if (this.getHealth() <= 0.0F) {
2017-05-14 20:05:01 +02:00
if (!this.e(damagesource)) {
2017-06-08 16:16:51 +02:00
SoundEffect soundeffect = this.cf();
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 e7f0e84d4..e148901e5 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
2016-11-17 03:23:38 +01:00
@@ -146,7 +146,7 @@ public class Explosion {
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
}
entity.motX += d8 * d14;
2016-11-17 03:23:38 +01:00
@@ -155,7 +155,7 @@ public class Explosion {
2016-03-01 00:09:49 +01:00
if (entity instanceof EntityHuman) {
EntityHuman entityhuman = (EntityHuman) entity;
2016-06-09 05:57:14 +02:00
- if (!entityhuman.isSpectator() && (!entityhuman.z() || !entityhuman.abilities.isFlying)) {
+ if (!entityhuman.isSpectator() && (!entityhuman.z() && !world.paperConfig.disableExplosionKnockback || !entityhuman.abilities.isFlying)) { // Paper - Disable explosion knockback
2016-03-01 00:09:49 +01:00
this.k.put(entityhuman, new Vec3D(d8 * d13, d9 * d13, d10 * d13));
}
}
--
2017-11-08 17:13:57 +01:00
2.14.3
2016-03-01 00:09:49 +01:00