Rebase on latest Purpur (#230)

This commit is contained in:
Encode42
2021-03-24 20:26:18 -04:00
committed by GitHub
parent 754948e524
commit b6235af624
94 changed files with 261 additions and 249 deletions

View File

@@ -38,10 +38,10 @@ index 61f06eacb4ea4ef869b60c9014cc23b25583eead..627915ee205fdcc93c5424ad7d7ea057
// CraftBukkit start - fire ExplosionPrimeEvent
ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 16eac6648c7bb17fb10f5741857ac5e8283aed50..ba4377422abe55a6ce98551eb9f8633589f37f4c 100644
index 593dfa8fdfbceb74bcc78072ac5c6e7df8ded242..fcf3f156ac8a2ec9078a00c326105888a8412df9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -868,6 +868,7 @@ public class PurpurWorldConfig {
@@ -880,6 +880,7 @@ public class PurpurWorldConfig {
public boolean ghastRidable = false;
public boolean ghastRidableInWater = false;
public double ghastMaxY = 256D;
@@ -49,7 +49,7 @@ index 16eac6648c7bb17fb10f5741857ac5e8283aed50..ba4377422abe55a6ce98551eb9f86335
public double ghastMaxHealth = 10.0D;
private void ghastSettings() {
ghastRidable = getBoolean("mobs.ghast.ridable", ghastRidable);
@@ -878,6 +879,7 @@ public class PurpurWorldConfig {
@@ -890,6 +891,7 @@ public class PurpurWorldConfig {
set("mobs.ghast.attributes.max-health", null);
set("mobs.ghast.attributes.max_health", oldValue);
}