SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Configurable damage tick when blocking with shield

Browse Source
This commit is contained in:
Bjarne Koll
2024-06-13 17:16:01 +02:00
parent d7b5168a81
commit c05db66ee6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
paper-server/patches/sources/net/minecraft/world/entity/LivingEntity.java.patch
View File

@@ -1284,7 +1284,7 @@
+ CriteriaTriggers.PLAYER_HURT_ENTITY.trigger((ServerPlayer) damagesource.getEntity(), this, damagesource, originalDamage, f, true); // Paper - fix taken/dealt param order + CriteriaTriggers.PLAYER_HURT_ENTITY.trigger((ServerPlayer) damagesource.getEntity(), this, damagesource, originalDamage, f, true); // Paper - fix taken/dealt param order
+ } + }
+ +
+ return true; + return !io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.skipVanillaDamageTickWhenShieldBlocked; // Paper - this should always return true, however expose an unsupported setting to flip this to false to enable "shield stunning".
+ } else { + } else {
+ return true; // Paper - return false ONLY if event was cancelled + return true; // Paper - return false ONLY if event was cancelled
+ } + }