mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 20:50:41 +01:00
26 lines
1.4 KiB
Diff
26 lines
1.4 KiB
Diff
|
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
|
||
|
|
index 99a634760cd04d5e3182254b1d0b817baf1cf87a..94cc69ed1ccbcfcc8f431762fef641c313b2f634 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
|