Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix some compile errors

Browse Source
This commit is contained in:
granny
2023-03-15 05:51:41 -07:00
parent 1dea120002
commit 6314bddba2
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0134-Dont-run-with-scissors.patch
View File

@@ -87,20 +87,20 @@ index 0b80bf3e30a83c8c284d196980340542bfca3ded..7bbfa2f8ac29dd32b100d356b285b5e5
damageTypeRegisterable.register(FALLING_ANVIL, new DamageType("anvil", 0.1F));
damageTypeRegisterable.register(FALLING_STALACTITE, new DamageType("fallingStalactite", 0.1F));
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index fb1555641047175060f381bf797c4a6fce75837a..15dabf8da91c003ee69934b7c59ef123a9ebc535 100644
index fb1555641047175060f381bf797c4a6fce75837a..debba52be7ba896f5a96a2ffa4e502101627a576 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1133,6 +1133,10 @@ public class CraftEventFactory {
@@ -1131,6 +1131,10 @@ public class CraftEventFactory {
cause = DamageCause.DRYOUT;
} else if (sourceType == DamageTypes.FREEZE) {
cause = DamageCause.FREEZE;
} else {
cause = DamageCause.CUSTOM;
+ // Purpur start
+ } else if (source == DamageSource.SCISSORS) {
+ } else if (sourceType == DamageTypes.SCISSORS) {
+ cause = DamageCause.SUICIDE;
+ // Purpur end
} else {
cause = DamageCause.CUSTOM;
}
if (cause != null) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 5b0625955e2a65f689c8a128d73170bc1f0c8025..c8097ec7887ac8e689b6843d9ff7744d6a453478 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java