it compiles \o/

This commit is contained in:
granny
2023-03-16 02:12:43 -07:00
parent 3c0d4f1d84
commit 55dbafe799
64 changed files with 599 additions and 814 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add enderman and creeper griefing controls
diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
index 445c8ef18e3c82598b27ebaa6a859d4dd1baf5ef..bdcd271d3755803edc315f7a5484236ad524b1a3 100644
index c368ac6f35ff4b309079b4895dcd3792f3b6b69e..ccdf278afc5eab5e05649d54ef30d1c27b8b9daa 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
@@ -361,7 +361,7 @@ public class Creeper extends Monster implements PowerableMob {
@@ -18,7 +18,7 @@ index 445c8ef18e3c82598b27ebaa6a859d4dd1baf5ef..bdcd271d3755803edc315f7a5484236a
this.spawnLingeringCloud();
} else {
diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
index 94bfabd8d7b4e860a99518b390ad2b7b5ef02070..da8d81bfba08f1e6e2b789e960b1d39692bb990b 100644
index 6e93faa6debeba159664401a49ddd5ca159abf80..7e67e034cf8b4459f274975567b9c25d7349abf1 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -530,6 +530,7 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -38,10 +38,10 @@ index 94bfabd8d7b4e860a99518b390ad2b7b5ef02070..da8d81bfba08f1e6e2b789e960b1d396
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d488ad7fe6119426f6ef269a8916514dddec91a6..dc2d5b50ce5d236fd2de0f82e307f62946df5109 100644
index e17d6ef06c6125e88986aa01243a6b96360c8114..5bd1546082466cac963cce61c72d2698267f3554 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -439,6 +439,7 @@ public class PurpurWorldConfig {
@@ -437,6 +437,7 @@ public class PurpurWorldConfig {
public boolean creeperControllable = true;
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
@@ -49,7 +49,7 @@ index d488ad7fe6119426f6ef269a8916514dddec91a6..dc2d5b50ce5d236fd2de0f82e307f629
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -450,6 +451,7 @@ public class PurpurWorldConfig {
@@ -448,6 +449,7 @@ public class PurpurWorldConfig {
}
creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
@@ -57,7 +57,7 @@ index d488ad7fe6119426f6ef269a8916514dddec91a6..dc2d5b50ce5d236fd2de0f82e307f629
}
public boolean dolphinRidable = false;
@@ -556,6 +558,7 @@ public class PurpurWorldConfig {
@@ -554,6 +556,7 @@ public class PurpurWorldConfig {
public boolean endermanRidableInWater = false;
public boolean endermanControllable = true;
public double endermanMaxHealth = 40.0D;
@@ -65,7 +65,7 @@ index d488ad7fe6119426f6ef269a8916514dddec91a6..dc2d5b50ce5d236fd2de0f82e307f629
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -566,6 +569,7 @@ public class PurpurWorldConfig {
@@ -564,6 +567,7 @@ public class PurpurWorldConfig {
set("mobs.enderman.attributes.max_health", oldValue);
}
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);