diff options
| author | Nassim Jahnke <[email protected]> | 2024-01-24 22:13:08 +0100 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2024-01-25 00:41:51 +0100 |
| commit | 1831240d1c48086fc0199584787cd2013d4d4b5f (patch) | |
| tree | d61d8d63ec61e8394df0b9c7db9219e1518741c2 /patches/server/0596-Don-t-apply-cramming-damage-to-players.patch | |
| parent | b7004609991dab287b582a1546a1b59c5d90c916 (diff) | |
| download | Paper-1831240d1c48086fc0199584787cd2013d4d4b5f.tar.gz Paper-1831240d1c48086fc0199584787cd2013d4d4b5f.zip | |
[ci skip] Move chunk system patch back
Diffstat (limited to 'patches/server/0596-Don-t-apply-cramming-damage-to-players.patch')
| -rw-r--r-- | patches/server/0596-Don-t-apply-cramming-damage-to-players.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0596-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0596-Don-t-apply-cramming-damage-to-players.patch index 928b033417..b85c69d7d7 100644 --- a/patches/server/0596-Don-t-apply-cramming-damage-to-players.patch +++ b/patches/server/0596-Don-t-apply-cramming-damage-to-players.patch @@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed, 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 f0f1c5b4dd4dffa29715e3cfe7225f0753713d98..481732b49b9492a7010d85932554b0d466e82765 100644 +index 33829587797f9bb6efccb0e5237b2aab020f837e..974874a6e72b65f956ebb5605547e5d1be74d2e8 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -95,6 +95,7 @@ import net.minecraft.util.Mth; @@ -22,7 +22,7 @@ index f0f1c5b4dd4dffa29715e3cfe7225f0753713d98..481732b49b9492a7010d85932554b0d4 import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; -@@ -1431,7 +1432,7 @@ public class ServerPlayer extends Player { +@@ -1430,7 +1431,7 @@ public class ServerPlayer extends Player { @Override public boolean isInvulnerableTo(DamageSource damageSource) { |