Skip to content

Commit d05e78b

Browse files
grannygranny
committed
drop two config options in favor of PurpurExtras impl
dropped options: - `mobs.snow_golem.drop-pumpkin-when-sheared` - `mobs.sheep.jeb-shear-random-color`
1 parent 3727300 commit d05e78b

108 files changed

Lines changed: 302 additions & 357 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎patches/server/0037-Snowman-drop-and-put-back-pumpkin.patch‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Snowman drop and put back pumpkin
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
8-
index 0c128449fbe51aa7e437568ba4bc857c1175df2b..9c8efa5dcd4ec78a4e071d6b06871d09b93a531d 100644
8+
index 0c128449fbe51aa7e437568ba4bc857c1175df2b..cf68f12da22cb9b0980c21e90caf4dea62769fa5 100644
99
--- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
1010
+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
1111
@@ -198,6 +198,14 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -23,36 +23,22 @@ index 0c128449fbe51aa7e437568ba4bc857c1175df2b..9c8efa5dcd4ec78a4e071d6b06871d09
2323
} else {
2424
return tryRide(player, hand); // Purpur
2525
}
26-
@@ -211,6 +219,11 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
27-
28-
@Override
29-
public java.util.List<ItemStack> generateDefaultDrops() {
30-
+ // Purpur start
31-
+ if (!level().purpurConfig.snowGolemDropsPumpkin) {
32-
+ return Shearable.super.generateDefaultDrops(0);
33-
+ }
34-
+ // Purpur end
35-
return java.util.Collections.singletonList(new ItemStack(Items.CARVED_PUMPKIN));
36-
}
37-
3826
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
39-
index 05b7788d168cadb594613d81cbff0726a63d81d2..a48dbad212789f90525e669ea81b1042c53cd06a 100644
27+
index 05b7788d168cadb594613d81cbff0726a63d81d2..f63849ddb622633da41c38c7cbc03f0061acf139 100644
4028
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
4129
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
42-
@@ -1176,6 +1176,8 @@ public class PurpurWorldConfig {
30+
@@ -1176,6 +1176,7 @@ public class PurpurWorldConfig {
4331
public boolean snowGolemControllable = true;
4432
public boolean snowGolemLeaveTrailWhenRidden = false;
4533
public double snowGolemMaxHealth = 4.0D;
46-
+ public boolean snowGolemDropsPumpkin = true;
4734
+ public boolean snowGolemPutPumpkinBack = false;
4835
private void snowGolemSettings() {
4936
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
5037
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
51-
@@ -1187,6 +1189,8 @@ public class PurpurWorldConfig {
38+
@@ -1187,6 +1188,7 @@ public class PurpurWorldConfig {
5239
set("mobs.snow_golem.attributes.max_health", oldValue);
5340
}
5441
snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);
55-
+ snowGolemDropsPumpkin = getBoolean("mobs.snow_golem.drop-pumpkin-when-sheared", snowGolemDropsPumpkin);
5642
+ snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);
5743
}
5844

‎patches/server/0049-Villagers-follow-emerald-blocks.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,34 +54,34 @@ index 731bf43e2685554174d7ff295b5561ecf9dd70fa..64dd35573db3feae6507fc05086ed08c
5454
this.goalSelector.addGoal(8, new WaterAvoidingRandomStrollGoal(this, 0.35D));
5555
this.goalSelector.addGoal(9, new InteractGoal(this, Player.class, 3.0F, 1.0F));
5656
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
57-
index 511cec787f2fb9e4985ffcfb13b1352a2c789fee..92a3e3c87ef30b9ba55b3a671f35209db6018631 100644
57+
index edbe9c93d03d3811e536d1a079e7b3511569ffa7..431fa9e522662b506c82fbe7e0266e5662ad91cc 100644
5858
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
5959
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
60-
@@ -1437,6 +1437,7 @@ public class PurpurWorldConfig {
60+
@@ -1435,6 +1435,7 @@ public class PurpurWorldConfig {
6161
public boolean villagerRidableInWater = true;
6262
public boolean villagerControllable = true;
6363
public double villagerMaxHealth = 20.0D;
6464
+ public boolean villagerFollowEmeraldBlock = false;
6565
private void villagerSettings() {
6666
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
6767
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
68-
@@ -1447,6 +1448,7 @@ public class PurpurWorldConfig {
68+
@@ -1445,6 +1446,7 @@ public class PurpurWorldConfig {
6969
set("mobs.villager.attributes.max_health", oldValue);
7070
}
7171
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
7272
+ villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
7373
}
7474

7575
public boolean vindicatorRidable = false;
76-
@@ -1469,6 +1471,7 @@ public class PurpurWorldConfig {
76+
@@ -1467,6 +1469,7 @@ public class PurpurWorldConfig {
7777
public boolean wanderingTraderRidableInWater = true;
7878
public boolean wanderingTraderControllable = true;
7979
public double wanderingTraderMaxHealth = 20.0D;
8080
+ public boolean wanderingTraderFollowEmeraldBlock = false;
8181
private void wanderingTraderSettings() {
8282
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
8383
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
84-
@@ -1479,6 +1482,7 @@ public class PurpurWorldConfig {
84+
@@ -1477,6 +1480,7 @@ public class PurpurWorldConfig {
8585
set("mobs.wandering_trader.attributes.max_health", oldValue);
8686
}
8787
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);

‎patches/server/0050-Allow-leashing-villagers.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow leashing villagers
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
8-
index 05eecaf3147051c44f9c4abce178c3126385c825..c77da33c38ddb9a383cb39e8a8837e67cf545bda 100644
8+
index f17b7e83a04a2cd738f7d708891fec2e341f3f96..a36994947d3a4f06f102bb143e44d0d7510f8338 100644
99
--- a/src/main/java/net/minecraft/world/entity/Mob.java
1010
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
1111
@@ -1317,6 +1317,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -49,34 +49,34 @@ index 64dd35573db3feae6507fc05086ed08c60f5ea01..ad7a32169b0decad1d3a2bd98e25b077
4949
protected void registerGoals() {
5050
this.goalSelector.addGoal(0, new FloatGoal(this));
5151
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
52-
index 92a3e3c87ef30b9ba55b3a671f35209db6018631..5ac666f1a71770891b3b437b2d68b0c5a952358f 100644
52+
index 431fa9e522662b506c82fbe7e0266e5662ad91cc..40a0cd68b1e35894360f0edc45bc30a5bd47622f 100644
5353
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
5454
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
55-
@@ -1438,6 +1438,7 @@ public class PurpurWorldConfig {
55+
@@ -1436,6 +1436,7 @@ public class PurpurWorldConfig {
5656
public boolean villagerControllable = true;
5757
public double villagerMaxHealth = 20.0D;
5858
public boolean villagerFollowEmeraldBlock = false;
5959
+ public boolean villagerCanBeLeashed = false;
6060
private void villagerSettings() {
6161
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
6262
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
63-
@@ -1449,6 +1450,7 @@ public class PurpurWorldConfig {
63+
@@ -1447,6 +1448,7 @@ public class PurpurWorldConfig {
6464
}
6565
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
6666
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
6767
+ villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
6868
}
6969

7070
public boolean vindicatorRidable = false;
71-
@@ -1472,6 +1474,7 @@ public class PurpurWorldConfig {
71+
@@ -1470,6 +1472,7 @@ public class PurpurWorldConfig {
7272
public boolean wanderingTraderControllable = true;
7373
public double wanderingTraderMaxHealth = 20.0D;
7474
public boolean wanderingTraderFollowEmeraldBlock = false;
7575
+ public boolean wanderingTraderCanBeLeashed = false;
7676
private void wanderingTraderSettings() {
7777
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
7878
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
79-
@@ -1483,6 +1486,7 @@ public class PurpurWorldConfig {
79+
@@ -1481,6 +1484,7 @@ public class PurpurWorldConfig {
8080
}
8181
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
8282
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);

‎patches/server/0065-Configurable-jockey-options.patch‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ index fa5fa58ee03243054a38475634a6aa67815ca77d..764477c39e690d6373e17c7768780941
167167
public void setPersistentAngerTarget(@Nullable UUID angryAt) {
168168
this.persistentAngerTarget = angryAt;
169169
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
170-
index 6d46b1682a7c0b8c638a047177ff99ee8c47de9c..5fd4129889b3006018612204bc527738a78a0d35 100644
170+
index b5599360a524a55183b3a21f822b5cb24f59dc67..5c83d5b665bfccd7c54c18012d4bec7d975de3f2 100644
171171
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
172172
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
173173
@@ -588,6 +588,9 @@ public class PurpurWorldConfig {
@@ -210,7 +210,7 @@ index 6d46b1682a7c0b8c638a047177ff99ee8c47de9c..5fd4129889b3006018612204bc527738
210210
}
211211

212212
public boolean illusionerRidable = false;
213-
@@ -1676,6 +1688,9 @@ public class PurpurWorldConfig {
213+
@@ -1674,6 +1686,9 @@ public class PurpurWorldConfig {
214214
public boolean zombieControllable = true;
215215
public double zombieMaxHealth = 20.0D;
216216
public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index 6d46b1682a7c0b8c638a047177ff99ee8c47de9c..5fd4129889b3006018612204bc527738
220220
private void zombieSettings() {
221221
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
222222
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
223-
@@ -1687,6 +1702,9 @@ public class PurpurWorldConfig {
223+
@@ -1685,6 +1700,9 @@ public class PurpurWorldConfig {
224224
}
225225
zombieMaxHealth = getDouble("mobs.zombie.attributes.max_health", zombieMaxHealth);
226226
zombieSpawnReinforcements = getDouble("mobs.zombie.attributes.spawn_reinforcements", zombieSpawnReinforcements);
@@ -230,7 +230,7 @@ index 6d46b1682a7c0b8c638a047177ff99ee8c47de9c..5fd4129889b3006018612204bc527738
230230
}
231231

232232
public boolean zombieHorseRidable = false;
233-
@@ -1723,6 +1741,9 @@ public class PurpurWorldConfig {
233+
@@ -1721,6 +1739,9 @@ public class PurpurWorldConfig {
234234
public boolean zombieVillagerControllable = true;
235235
public double zombieVillagerMaxHealth = 20.0D;
236236
public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,7 @@ index 6d46b1682a7c0b8c638a047177ff99ee8c47de9c..5fd4129889b3006018612204bc527738
240240
private void zombieVillagerSettings() {
241241
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
242242
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
243-
@@ -1734,6 +1755,9 @@ public class PurpurWorldConfig {
243+
@@ -1732,6 +1753,9 @@ public class PurpurWorldConfig {
244244
}
245245
zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
246246
zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
@@ -250,7 +250,7 @@ index 6d46b1682a7c0b8c638a047177ff99ee8c47de9c..5fd4129889b3006018612204bc527738
250250
}
251251

252252
public boolean zombifiedPiglinRidable = false;
253-
@@ -1741,6 +1765,9 @@ public class PurpurWorldConfig {
253+
@@ -1739,6 +1763,9 @@ public class PurpurWorldConfig {
254254
public boolean zombifiedPiglinControllable = true;
255255
public double zombifiedPiglinMaxHealth = 20.0D;
256256
public double zombifiedPiglinSpawnReinforcements = 0.0D;
@@ -260,7 +260,7 @@ index 6d46b1682a7c0b8c638a047177ff99ee8c47de9c..5fd4129889b3006018612204bc527738
260260
private void zombifiedPiglinSettings() {
261261
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
262262
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
263-
@@ -1752,5 +1779,8 @@ public class PurpurWorldConfig {
263+
@@ -1750,5 +1777,8 @@ public class PurpurWorldConfig {
264264
}
265265
zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
266266
zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);

‎patches/server/0074-Squid-EAR-immunity.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ Subject: [PATCH] Squid EAR immunity
55

66

77
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
8-
index 3d7726bd54781e922f9d2b5b1fea510d6295919e..3557d668d5117aaaef2fde0792b58c7e58546c22 100644
8+
index e813fa037ca17bec29db916eac882cbfab432e56..c87c7feb140864771cbef3dcee1f89319c9a1f83 100644
99
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
1010
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
11-
@@ -1455,6 +1455,7 @@ public class PurpurWorldConfig {
11+
@@ -1453,6 +1453,7 @@ public class PurpurWorldConfig {
1212
public boolean squidRidable = false;
1313
public boolean squidControllable = true;
1414
public double squidMaxHealth = 10.0D;
1515
+ public boolean squidImmuneToEAR = true;
1616
private void squidSettings() {
1717
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
1818
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
19-
@@ -1464,6 +1465,7 @@ public class PurpurWorldConfig {
19+
@@ -1462,6 +1463,7 @@ public class PurpurWorldConfig {
2020
set("mobs.squid.attributes.max_health", oldValue);
2121
}
2222
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
@@ -25,7 +25,7 @@ index 3d7726bd54781e922f9d2b5b1fea510d6295919e..3557d668d5117aaaef2fde0792b58c7e
2525

2626
public boolean spiderRidable = false;
2727
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
28-
index 282a57df4e2e5708e9cfd9c76b1d7de2a8a23900..a7ecbd77d0017a298b94cceeddc049eff713f60f 100644
28+
index 08b266efbefc45e9b08b2c03a36441a8c7564197..e7c384a8bf16de5132245c24226fff22f5c38585 100644
2929
--- a/src/main/java/org/spigotmc/ActivationRange.java
3030
+++ b/src/main/java/org/spigotmc/ActivationRange.java
3131
@@ -15,6 +15,7 @@ import net.minecraft.world.entity.ambient.AmbientCreature;

‎patches/server/0076-Configurable-villager-breeding.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ index f4ed6ae7e8f122a0a2ce7f4488b0fe1ed0c7da3d..ce450d4b0d42443a47861dcb54b78a01
1818

1919
private boolean hungry() {
2020
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
21-
index 81dd8666fd997f92972da2c6980c6ce515582fbc..51dd20665e5cdf1e76a63367d75890d4ae8f55b6 100644
21+
index a0477b47563214152483423121523f836827306b..3decdb56a21e7be052ef9386f2059e912738d4be 100644
2222
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
2323
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
24-
@@ -1613,6 +1613,7 @@ public class PurpurWorldConfig {
24+
@@ -1611,6 +1611,7 @@ public class PurpurWorldConfig {
2525
public double villagerMaxHealth = 20.0D;
2626
public boolean villagerFollowEmeraldBlock = false;
2727
public boolean villagerCanBeLeashed = false;
2828
+ public boolean villagerCanBreed = true;
2929
private void villagerSettings() {
3030
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
3131
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
32-
@@ -1625,6 +1626,7 @@ public class PurpurWorldConfig {
32+
@@ -1623,6 +1624,7 @@ public class PurpurWorldConfig {
3333
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
3434
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
3535
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);

‎patches/server/0079-Add-vindicator-johnny-spawn-chance.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ index fece613e9c182c6658f9df1d333a5b7e1e862218..a3db9c351b9cb06340458811c006d537
2222
}
2323

2424
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
25-
index 538c6f1cec00ef0ce8e793a5d205875d2d9aac92..7bcba65dfaa0076c5ce9271a5f54d01a99025242 100644
25+
index 65c365cd330b8865f0aeb7781a8995cbfea62f18..ac14ad278466dca95ad012c0b064b5bb470d06c8 100644
2626
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
2727
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
28-
@@ -1640,6 +1640,7 @@ public class PurpurWorldConfig {
28+
@@ -1638,6 +1638,7 @@ public class PurpurWorldConfig {
2929
public boolean vindicatorRidableInWater = true;
3030
public boolean vindicatorControllable = true;
3131
public double vindicatorMaxHealth = 24.0D;
3232
+ public double vindicatorJohnnySpawnChance = 0D;
3333
private void vindicatorSettings() {
3434
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
3535
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
36-
@@ -1650,6 +1651,7 @@ public class PurpurWorldConfig {
36+
@@ -1648,6 +1649,7 @@ public class PurpurWorldConfig {
3737
set("mobs.vindicator.attributes.max_health", oldValue);
3838
}
3939
vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);

‎patches/server/0084-Stop-squids-floating-on-top-of-water.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@ index 67d595f75e0c3bffdb27b85b25ccd1f0bf1427d5..4d0c524af87d05dbd4a923ad6c40e1f2
5454
+ // Purpur
5555
}
5656
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
57-
index afc67803bf71d26e84f9130c30ac2b1b3d1114bf..d6b6d112da049e26ee867d81e37baa8f7bd4cda0 100644
57+
index 4218ebd3aa75c7290f1f8bb6ebd357ae3faf53f1..cb1d95f6f786df7a8825016b70c3c6b718f60358 100644
5858
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
5959
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
60-
@@ -1480,6 +1480,7 @@ public class PurpurWorldConfig {
60+
@@ -1478,6 +1478,7 @@ public class PurpurWorldConfig {
6161
public boolean squidControllable = true;
6262
public double squidMaxHealth = 10.0D;
6363
public boolean squidImmuneToEAR = true;
6464
+ public double squidOffsetWaterCheck = 0.0D;
6565
private void squidSettings() {
6666
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
6767
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
68-
@@ -1490,6 +1491,7 @@ public class PurpurWorldConfig {
68+
@@ -1488,6 +1489,7 @@ public class PurpurWorldConfig {
6969
}
7070
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
7171
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);

0 commit comments

Comments
 (0)