diff options
Diffstat (limited to 'patches/server/0667-Don-t-apply-cramming-damage-to-players.patch')
| -rw-r--r-- | patches/server/0667-Don-t-apply-cramming-damage-to-players.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/patches/server/0667-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0667-Don-t-apply-cramming-damage-to-players.patch new file mode 100644 index 0000000000..6487e17c55 --- /dev/null +++ b/patches/server/0667-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 31d976d0a4fdf3bb155e08627ce4a85bd5d051db..a02b02c71ac6dddcccb10a6aa7993337ed04b829 100644 +--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java ++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +@@ -1431,7 +1431,7 @@ public class ServerPlayer extends Player { + + @Override + public boolean isInvulnerableTo(DamageSource damageSource) { +- return super.isInvulnerableTo(damageSource) || this.isChangingDimension() || this.getAbilities().invulnerable && damageSource == DamageSource.WITHER; ++ return super.isInvulnerableTo(damageSource) || this.isChangingDimension() || this.getAbilities().invulnerable && damageSource == DamageSource.WITHER || !level.paperConfig().collisions.allowPlayerCrammingDamage && damageSource == DamageSource.CRAMMING; // Paper - disable player cramming + } + + @Override |