testserver/Spigot-Server-Patches/0031-Disable-explosion-knoc...

74 lines
3.7 KiB
Diff
Raw Normal View History

2019-04-25 06:53:51 +00:00
From 8f2350f0a8682976968073072d82217c8b358034 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
2019-04-25 06:53:51 +00:00
index a5ec0bc0e0..6a307d5dd6 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
2019-04-25 06:53:51 +00:00
@@ -151,4 +151,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
2019-04-25 06:53:51 +00:00
index 85567a7072..d85172e728 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
2019-04-25 06:53:51 +00:00
@@ -1112,6 +1112,7 @@ public abstract class EntityLiving extends Entity {
2016-02-29 23:09:49 +00:00
}
}
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);
2019-04-25 06:53:51 +00:00
@@ -1130,6 +1131,7 @@ public abstract class EntityLiving extends Entity {
b0 = 2;
}
2017-05-14 18:05:01 +00:00
2016-02-29 23:09:49 +00:00
+ if (!knockbackCancelled) // Paper - Disable explosion knockback
this.world.broadcastEntityEffect(this, b0);
}
2016-02-29 23:09:49 +00:00
2019-04-25 06:53:51 +00:00
@@ -1153,6 +1155,8 @@ public abstract class EntityLiving extends Entity {
2016-02-29 23:09:49 +00:00
}
}
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) {
2019-04-25 06:53:51 +00:00
if (!this.f(damagesource)) {
SoundEffect soundeffect = this.getSoundDeath();
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
2019-04-25 06:53:51 +00:00
index bcff117619..6eeff4ce59 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
2019-04-25 06:53:51 +00:00
@@ -188,14 +188,14 @@ 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
}
2019-04-25 06:53:51 +00:00
entity.setMot(entity.getMot().add(d8 * d14, d9 * d14, d10 * d14));
2016-02-29 23:09:49 +00:00
if (entity instanceof EntityHuman) {
EntityHuman entityhuman = (EntityHuman) entity;
2019-04-25 06:53:51 +00:00
- if (!entityhuman.isSpectator() && (!entityhuman.isCreative() || !entityhuman.abilities.isFlying)) {
+ if (!entityhuman.isSpectator() && (!entityhuman.isCreative() && !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.21.0
2016-02-29 23:09:49 +00:00