Skip to content

Commit

Permalink
Add '*' as an option to item immunities
Browse files Browse the repository at this point in the history
  • Loading branch information
BillyGalbreath committed Jan 25, 2021
1 parent df9bd08 commit 7b0b3f7
Show file tree
Hide file tree
Showing 64 changed files with 213 additions and 201 deletions.
16 changes: 14 additions & 2 deletions patches/server/0077-Item-entity-immunities.patch
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ index 228236bce14bfdf930570b453862dcfaae9e4823..ad06bd81eded5d60f16c2d0ad1a4390f
int i;
int j;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c5193b394319fa68bedc6aa07b57fea24ac49d80..399e9b3e6289efe0fc5db274c10a5cad41d68909 100644
index c5193b394319fa68bedc6aa07b57fea24ac49d80..9940bf351c05606137837ab2400ffe1a02b9bec2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -101,6 +101,27 @@ public class PurpurWorldConfig {
@@ -101,6 +101,39 @@ public class PurpurWorldConfig {
}
}

Expand All @@ -107,16 +107,28 @@ index c5193b394319fa68bedc6aa07b57fea24ac49d80..399e9b3e6289efe0fc5db274c10a5cad
+ private void itemSettings() {
+ itemImmuneToCactus.clear();
+ getList("gameplay-mechanics.item.immune.cactus", new ArrayList<>()).forEach(key -> {
+ if (key.toString().equals("*")) {
+ IRegistry.ITEM.g().filter(item -> item != Items.AIR).forEach((item) -> itemImmuneToCactus.add(item));
+ return;
+ }
+ Item item = IRegistry.ITEM.get(new MinecraftKey(key.toString()));
+ if (item != Items.AIR) itemImmuneToCactus.add(item);
+ });
+ itemImmuneToExplosion.clear();
+ getList("gameplay-mechanics.item.immune.explosion", new ArrayList<>()).forEach(key -> {
+ if (key.toString().equals("*")) {
+ IRegistry.ITEM.g().filter(item -> item != Items.AIR).forEach((item) -> itemImmuneToExplosion.add(item));
+ return;
+ }
+ Item item = IRegistry.ITEM.get(new MinecraftKey(key.toString()));
+ if (item != Items.AIR) itemImmuneToExplosion.add(item);
+ });
+ itemImmuneToFire.clear();
+ getList("gameplay-mechanics.item.immune.fire", new ArrayList<>()).forEach(key -> {
+ if (key.toString().equals("*")) {
+ IRegistry.ITEM.g().filter(item -> item != Items.AIR).forEach((item) -> itemImmuneToFire.add(item));
+ return;
+ }
+ Item item = IRegistry.ITEM.get(new MinecraftKey(key.toString()));
+ if (item != Items.AIR) itemImmuneToFire.add(item);
+ });
Expand Down
8 changes: 4 additions & 4 deletions patches/server/0079-Configurable-jockey-options.patch
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,10 @@ index e021c43b43839c00f81a01bfbec59c546d61ba50..505c83f3e3ad61c2d4d40c4df017e1f7
protected void initDatawatcher() {
super.initDatawatcher();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 399e9b3e6289efe0fc5db274c10a5cad41d68909..a2b2318332399def197a5f7ac22d7cd0430ccde7 100644
index 9940bf351c05606137837ab2400ffe1a02b9bec2..81a96503a6243800f4c37dc32f9550e3ee817fbb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -263,6 +263,15 @@ public class PurpurWorldConfig {
@@ -275,6 +275,15 @@ public class PurpurWorldConfig {
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
}

Expand All @@ -212,7 +212,7 @@ index 399e9b3e6289efe0fc5db274c10a5cad41d68909..a2b2318332399def197a5f7ac22d7cd0
public boolean enderDragonAlwaysDropsFullExp = false;
private void enderDragonSettings() {
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
@@ -300,6 +309,15 @@ public class PurpurWorldConfig {
@@ -312,6 +321,15 @@ public class PurpurWorldConfig {
giantMaxHealth = getDouble("mobs.giant.attributes.max-health", giantMaxHealth);
}

Expand All @@ -228,7 +228,7 @@ index 399e9b3e6289efe0fc5db274c10a5cad41d68909..a2b2318332399def197a5f7ac22d7cd0
public double illusionerMovementSpeed = 0.5D;
public double illusionerFollowRange = 18.0D;
public double illusionerMaxHealth = 32.0D;
@@ -375,8 +393,35 @@ public class PurpurWorldConfig {
@@ -387,8 +405,35 @@ public class PurpurWorldConfig {
witherSkeletonTakesWitherDamage = getBoolean("mobs.wither_skeleton.takes-wither-damage", witherSkeletonTakesWitherDamage);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -321,10 +321,10 @@ index 3a70900c73e3a6c4f40cf74406534f4bfd3eb67b..dfce36368da9bdd9285c490a802f7a0c

return entityliving != null ? EntityPhantom.this.a(EntityPhantom.this.getGoalTarget(), PathfinderTargetCondition.a) : false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a2b2318332399def197a5f7ac22d7cd0430ccde7..7eecd48d572635f1082ca1629471341eac82b6e1 100644
index 81a96503a6243800f4c37dc32f9550e3ee817fbb..39f6b309342b91ab3bd4eed4afbeb8ccb1387e64 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -337,6 +337,15 @@ public class PurpurWorldConfig {
@@ -349,6 +349,15 @@ public class PurpurWorldConfig {
ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim);
}

Expand Down
4 changes: 2 additions & 2 deletions patches/server/0081-Add-phantom-spawning-options.patch
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,10 @@ index fb650c09dbcefa0ff021f7c508ff6811a48bee7a..68cce071c740c90149225b4a28af8492
public int c() {
return this.d;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7eecd48d572635f1082ca1629471341eac82b6e1..feb8434f0c62f1de177326d28e52beb487487e76 100644
index 39f6b309342b91ab3bd4eed4afbeb8ccb1387e64..966784d5398929497f4a426280bba47bb7caf9a7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -340,10 +340,34 @@ public class PurpurWorldConfig {
@@ -352,10 +352,34 @@ public class PurpurWorldConfig {
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
public double phantomOrbitCrystalRadius = 0.0D;
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0082-Implement-bed-explosion-options.patch
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ index 24a5c64b65f0098b1395d352cc2f99bbbbaf9c94..738535d01adf8bfd895b5057e5950422
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index feb8434f0c62f1de177326d28e52beb487487e76..e86e11f5d0d48871b47aa4038370cc3ca0859f8c 100644
index 966784d5398929497f4a426280bba47bb7caf9a7..ea20ca8dc50ff1216ce8ca351ef991d5808bd88c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -2,6 +2,7 @@ package net.pl3x.purpur;
Expand All @@ -37,7 +37,7 @@ index feb8434f0c62f1de177326d28e52beb487487e76..e86e11f5d0d48871b47aa4038370cc3c

import static net.pl3x.purpur.PurpurConfig.log;

@@ -200,6 +202,22 @@ public class PurpurWorldConfig {
@@ -212,6 +214,22 @@ public class PurpurWorldConfig {
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ index 21c5ad83a95bcd23071423c0e8336656b760fcde..521d161a3d015b641b61de21401c79ac

public static boolean a(World world) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e86e11f5d0d48871b47aa4038370cc3ca0859f8c..8564c502e5de5f89a2aa05a3173bd96ca8952eec 100644
index ea20ca8dc50ff1216ce8ca351ef991d5808bd88c..8aaa718a0df3f71f9a06bf8eb3547453b26551da 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -239,6 +239,22 @@ public class PurpurWorldConfig {
@@ -251,6 +251,22 @@ public class PurpurWorldConfig {
lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
}

Expand Down
2 changes: 1 addition & 1 deletion patches/server/0086-Entity-lifespan.patch
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ index ffccdc3bf1d28836f4fc2772ebfde843415ea232..8932f4854d9fc52fb2ec66a748e640df
event = new PlayerInteractEntityEvent((Player) this.getPlayer(), entity.getBukkitEntity(), (packetplayinuseentity.c() == EnumHand.OFF_HAND) ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND);
} else {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8564c502e5de5f89a2aa05a3173bd96ca8952eec..e6a7594bec24dad1bb8b1bfd23a724121909bf9a 100644
index 8aaa718a0df3f71f9a06bf8eb3547453b26551da..5a04f0e506293f76bc43540142ca3b26cf97c760 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -103,6 +103,11 @@ public class PurpurWorldConfig {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ index ff4e60e321e0df7d43078ae0899b9e08717ad9b3..994e17f874696d7a410d2c308efe060d
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e6a7594bec24dad1bb8b1bfd23a724121909bf9a..90963c50431bafd52bab4b88f382a7c2e9bdc9fa 100644
index 5a04f0e506293f76bc43540142ca3b26cf97c760..0b2a9a2d9f157dd9879c4429be6745859b4f28bf 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -184,6 +184,11 @@ public class PurpurWorldConfig {
@@ -196,6 +196,11 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
}

Expand Down
4 changes: 2 additions & 2 deletions patches/server/0088-Squid-EAR-immunity.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Squid EAR immunity


diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 90963c50431bafd52bab4b88f382a7c2e9bdc9fa..8513586bb49db65de779925082aa30abc4c96ad8 100644
index 0b2a9a2d9f157dd9879c4429be6745859b4f28bf..01576ac82836733f42168c6a0779b45ae63aeebb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -441,6 +441,11 @@ public class PurpurWorldConfig {
@@ -453,6 +453,11 @@ public class PurpurWorldConfig {
snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);
}

Expand Down
6 changes: 3 additions & 3 deletions patches/server/0091-Phantoms-burn-in-light.patch
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ index 4c379916d8d7797038d2980761c49f44c010dea8..ea6b61c9b88f33d29f7266d7614c8037
public static final Item dr = a(Blocks.JACK_O_LANTERN, CreativeModeTab.b);
public static final Item ds = a(Blocks.OAK_TRAPDOOR, CreativeModeTab.d);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8513586bb49db65de779925082aa30abc4c96ad8..d99edfca69b981f9a9187c3187a7245e697a142f 100644
index 01576ac82836733f42168c6a0779b45ae63aeebb..a4e5462d4731aaa4b0c436cf001d9c2be1cc961c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -396,6 +396,9 @@ public class PurpurWorldConfig {
@@ -408,6 +408,9 @@ public class PurpurWorldConfig {
public int phantomSpawnOverheadRadius = 10;
public int phantomSpawnMinPerAttempt = 1;
public int phantomSpawnMaxPerAttempt = -1;
Expand All @@ -83,7 +83,7 @@ index 8513586bb49db65de779925082aa30abc4c96ad8..d99edfca69b981f9a9187c3187a7245e
private void phantomSettings() {
phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
@@ -412,6 +415,9 @@ public class PurpurWorldConfig {
@@ -424,6 +427,9 @@ public class PurpurWorldConfig {
phantomSpawnOverheadRadius = getInt("mobs.phantom.spawn.overhead.radius", phantomSpawnOverheadRadius);
phantomSpawnMinPerAttempt = getInt("mobs.phantom.spawn.per-attempt.min", phantomSpawnMinPerAttempt);
phantomSpawnMaxPerAttempt = getInt("mobs.phantom.spawn.per-attempt.max", phantomSpawnMaxPerAttempt);
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0092-Configurable-villager-breeding.patch
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ index c06425434c97645b914c07940528901a2979ce1b..a0bfef54c853d57c9a5c6d3f9f195916

private boolean fr() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d99edfca69b981f9a9187c3187a7245e697a142f..9cbdf0f7553f9be72a1039b56dc9092fd3a3043f 100644
index a4e5462d4731aaa4b0c436cf001d9c2be1cc961c..76ed53f930f6d2e01a854d0e28db4bcf11a06627 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -459,6 +459,7 @@ public class PurpurWorldConfig {
@@ -471,6 +471,7 @@ public class PurpurWorldConfig {
public boolean villagerFollowEmeraldBlock = false;
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
+ public boolean villagerCanBreed = true;
private void villagerSettings() {
villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
@@ -467,6 +468,7 @@ public class PurpurWorldConfig {
@@ -479,6 +480,7 @@ public class PurpurWorldConfig {
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0093-Redstone-deactivates-spawners.patch
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ index c2e830db7aa2944a477624e149a3ba66d112b68a..3b4cc9871c123cfd134783745145c407
public abstract BlockPosition b();
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9cbdf0f7553f9be72a1039b56dc9092fd3a3043f..6b8eeb4a11ed24ac0f855919c2862b0bb5c55d76 100644
index 76ed53f930f6d2e01a854d0e28db4bcf11a06627..1f83fae3935d8bdacd396697e36d3c80d4d93b42 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -272,6 +272,11 @@ public class PurpurWorldConfig {
@@ -284,6 +284,11 @@ public class PurpurWorldConfig {
signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
}

Expand Down
4 changes: 2 additions & 2 deletions patches/server/0094-Totems-work-in-inventory.patch
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ index bfbe9b82c14a525bffa96a8dfa071e8805ce6006..c22fa35197ae23526a29bcbf69f3022f
event.setCancelled(itemstack == null);
this.world.getServer().getPluginManager().callEvent(event);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6b8eeb4a11ed24ac0f855919c2862b0bb5c55d76..9d0c38d583cd03100df53eba7db090f62ee8b59a 100644
index 1f83fae3935d8bdacd396697e36d3c80d4d93b42..9c32d1d0d283ce8fb290623c8e40c2606d2fdd82 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -189,6 +189,11 @@ public class PurpurWorldConfig {
@@ -201,6 +201,11 @@ public class PurpurWorldConfig {
teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ index 4761ddfedeed54e79788a6f60f06a805efd60ab1..23b350f793539672b6990327ed52e9bb
}

diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9d0c38d583cd03100df53eba7db090f62ee8b59a..4d8fa3a6e9729b3172685a9f3d27af06792ac8ca 100644
index 9c32d1d0d283ce8fb290623c8e40c2606d2fdd82..a38cea444879becaa043f131b754f7d812375e6c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -40,6 +40,11 @@ public class PurpurWorldConfig {
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0101-Dispensers-place-anvils-option.patch
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ index 7b8a470d97ccf0fdcdb8eef9368195486e09913b..d1f9d2884d055efbe72b01f86b0bdaf1

static void a(ISourceBlock isourceblock, Entity entity, EnumDirection enumdirection) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4d8fa3a6e9729b3172685a9f3d27af06792ac8ca..be101114003d06b445040b98b8b80e78a0b44bed 100644
index a38cea444879becaa043f131b754f7d812375e6c..059c66a2d3f878cde8896c8f10f71bfecaea4685 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -239,8 +239,10 @@ public class PurpurWorldConfig {
@@ -251,8 +251,10 @@ public class PurpurWorldConfig {
}

public boolean dispenserApplyCursedArmor = true;
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0102-Allow-anvil-colors.patch
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ index 4aa6b035a6a8ea39401c6566cd286de39f60e942..5e4e59e5c8478b76078fdda14e5ced76
}

diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index be101114003d06b445040b98b8b80e78a0b44bed..02fdf6d801f6583ac9991fc08d9811432fb9602b 100644
index 059c66a2d3f878cde8896c8f10f71bfecaea4685..95d13aafc468532f66abd265657f463e361f2297 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -222,6 +222,11 @@ public class PurpurWorldConfig {
@@ -234,6 +234,11 @@ public class PurpurWorldConfig {
});
}

Expand Down
4 changes: 2 additions & 2 deletions patches/server/0103-Add-no-tick-block-list.patch
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ index 2f41a537fb1d8348b5f65a3e85da841761311744..d5007d00da9a10e99d7fa46a4368d41f
this.nextTickListFluid = new TickListServer<>(this, (fluidtype) -> {
return fluidtype == null || fluidtype == FluidTypes.EMPTY;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 02fdf6d801f6583ac9991fc08d9811432fb9602b..20643bb4e8f0696729f68b430588f71ad090d963 100644
index 95d13aafc468532f66abd265657f463e361f2297..84db039126ab866aa2be4b7b1c0efa7e17573a54 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -11,8 +11,10 @@ import org.bukkit.configuration.ConfigurationSection;
Expand All @@ -57,7 +57,7 @@ index 02fdf6d801f6583ac9991fc08d9811432fb9602b..20643bb4e8f0696729f68b430588f71a
import java.util.logging.Level;

import static net.pl3x.purpur.PurpurConfig.log;
@@ -189,6 +191,16 @@ public class PurpurWorldConfig {
@@ -201,6 +203,16 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ index 2916ee89ef7a14619703dfbe7efd5c78a2f34337..664f9693368852bfb06a7a3bd0862a10
}

diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 20643bb4e8f0696729f68b430588f71ad090d963..81b5ffd65bde9f73d7c920bec3466222e03ffe83 100644
index 84db039126ab866aa2be4b7b1c0efa7e17573a54..33aae151c8d79bac8fb52f2c3f526d0017306098 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -341,6 +341,11 @@ public class PurpurWorldConfig {
@@ -353,6 +353,11 @@ public class PurpurWorldConfig {
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ index b21605a62365fe24f315f35bd840b4740fc80f0e..148e4b158734f136832e5c17bdc69634
protected void initPathfinder() {
this.goalSelector.a(0, new EntitySquid.PathfinderGoalSquid(this));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 81b5ffd65bde9f73d7c920bec3466222e03ffe83..19aded59462bd6851924362da124dee86e5104ae 100644
index 33aae151c8d79bac8fb52f2c3f526d0017306098..94f11a3dc2a4e595e3fe9dffee3d31de0040292f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -487,8 +487,10 @@ public class PurpurWorldConfig {
@@ -499,8 +499,10 @@ public class PurpurWorldConfig {
}

public boolean squidImmuneToEAR = true;
Expand Down
Loading

0 comments on commit 7b0b3f7

Please sign in to comment.