diff --git a/patches/server/0142-Dont-run-with-scissors.patch b/patches/server/0142-Dont-run-with-scissors.patch index 766f95b1c..e04f4aefd 100644 --- a/patches/server/0142-Dont-run-with-scissors.patch +++ b/patches/server/0142-Dont-run-with-scissors.patch @@ -53,18 +53,20 @@ index 32bf8264fecb8873f3ffa0e57a4bb48b5517fb77..0f56c60962b9c61c72d05edc7d9b10e9 private boolean damageHelmet; private boolean bypassArmor; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 159924aefae87f69492ecc0c93a638758f6632a5..ff7012efaa21510ddfbe20a0175b9f8be2f8cca2 100644 +index 159924aefae87f69492ecc0c93a638758f6632a5..990e3356d3ff26e14dfcc897a25b015454d6c8d7 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1036,6 +1036,8 @@ public class CraftEventFactory { - // Purpur start - } else if (source == DamageSource.STONECUTTER) { - cause = DamageCause.CONTACT; -+ } else if (source == DamageSource.SCISSORS) { -+ cause = DamageCause.SUICIDE; - // Purpur end - } else { - throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager, source.msgId)); +@@ -1105,6 +1105,10 @@ public class CraftEventFactory { + cause = DamageCause.FREEZE; + } else if (source == DamageSource.GENERIC) { + cause = DamageCause.CUSTOM; ++ // Purpur start ++ } else if (source == DamageSource.SCISSORS) { ++ cause = DamageCause.SUICIDE; ++ // Purpur end + } + + if (cause != null) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 4592b84984d35ee4cc63beebacad089c5a0317ed..2cd5c8823eb8215b3e2a6eb7dd34b752a480dbd0 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java