diff options
Diffstat (limited to 'patches/server/0557-Don-t-apply-cramming-damage-to-players.patch')
| -rw-r--r-- | patches/server/0557-Don-t-apply-cramming-damage-to-players.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/patches/server/0557-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0557-Don-t-apply-cramming-damage-to-players.patch new file mode 100644 index 0000000000..55a1fe08a5 --- /dev/null +++ b/patches/server/0557-Don-t-apply-cramming-damage-to-players.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Phoenix616 <[email protected]> +Date: Sun, 20 Jun 2021 16:35:42 +0100 +Subject: [PATCH] Don't apply cramming damage to players + +It does not make a lot of sense to damage players if they get crammed, + especially as the usecase of teleporting lots of players to the same + location isn't too uncommon and killing all those players isn't + really what one would expect to happen. + +For those who really want it a config option is provided. + +diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java +index 98979f82a14c057bd0640b598d5832c620333d1e..b3fb9d8942b0c56d343656c45ec96d22c00b5def 100644 +--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java ++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +@@ -1814,7 +1814,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { + + @Override + public boolean isInvulnerableTo(ServerLevel world, DamageSource source) { +- return super.isInvulnerableTo(world, source) || this.isChangingDimension() && !source.is(DamageTypes.ENDER_PEARL); ++ return super.isInvulnerableTo(world, source) || (this.isChangingDimension() && !source.is(DamageTypes.ENDER_PEARL)) || (!this.level().paperConfig().collisions.allowPlayerCrammingDamage && source.is(DamageTypes.CRAMMING)); // Paper - disable player cramming; + } + + @Override |