2021-07-19 09:31:03 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Phoenix616 <max@themoep.de>
|
|
|
|
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
|
2022-08-08 15:25:41 +00:00
|
|
|
index 787f2b23352fbfb66a76ca5fce6de94cc10b30d2..56ac440465813a7dab8d166e882e18143a50729f 100644
|
2021-07-19 09:31:03 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
2022-07-27 21:19:52 +00:00
|
|
|
@@ -1446,7 +1446,7 @@ public class ServerPlayer extends Player {
|
2021-07-19 09:31:03 +00:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public boolean isInvulnerableTo(DamageSource damageSource) {
|
|
|
|
- return super.isInvulnerableTo(damageSource) || this.isChangingDimension() || this.getAbilities().invulnerable && damageSource == DamageSource.WITHER;
|
2022-06-09 08:51:45 +00:00
|
|
|
+ return super.isInvulnerableTo(damageSource) || this.isChangingDimension() || this.getAbilities().invulnerable && damageSource == DamageSource.WITHER || !level.paperConfig().collisions.allowPlayerCrammingDamage && damageSource == DamageSource.CRAMMING; // Paper - disable player cramming
|
2021-07-19 09:31:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|