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

[ci-skip] clean up stray imports

Browse Source
This commit is contained in:
granny
2023-08-13 07:48:40 -07:00
parent cf3dca9776
commit 1846bae1b6
205 changed files with 905 additions and 923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0147-Add-config-for-villager-trading.patch
View File

@@ -31,10 +31,10 @@ index 5c6f1d3ffa2a2b6990d2406b14679e8286f60729..68d263a7647e395d981014f7cc761fe7
this.openTradingScreen(player, this.getDisplayName(), 1);
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 955fee5b85ea5efe76c55b79b63db661163f59cc..8a6ed1f0122f8fd7e3c25145dfe5f3c1a397fcc2 100644
index c324b47449148a2b07b748cca456faa67c9358ba..37ee42c46d469e11dc48eb292442beaac3e74445 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2129,6 +2129,7 @@ public class PurpurWorldConfig {
@@ -2127,6 +2127,7 @@ public class PurpurWorldConfig {
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
public boolean villagerTakeDamageFromWater = false;
@@ -42,7 +42,7 @@ index 955fee5b85ea5efe76c55b79b63db661163f59cc..8a6ed1f0122f8fd7e3c25145dfe5f3c1
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2147,6 +2148,7 @@ public class PurpurWorldConfig {
@@ -2145,6 +2146,7 @@ public class PurpurWorldConfig {
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater);
@@ -50,7 +50,7 @@ index 955fee5b85ea5efe76c55b79b63db661163f59cc..8a6ed1f0122f8fd7e3c25145dfe5f3c1
}
public boolean vindicatorRidable = false;
@@ -2176,6 +2178,7 @@ public class PurpurWorldConfig {
@@ -2174,6 +2176,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
public boolean wanderingTraderTakeDamageFromWater = false;
@@ -58,7 +58,7 @@ index 955fee5b85ea5efe76c55b79b63db661163f59cc..8a6ed1f0122f8fd7e3c25145dfe5f3c1
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -2189,6 +2192,7 @@ public class PurpurWorldConfig {
@@ -2187,6 +2190,7 @@ public class PurpurWorldConfig {
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);
wanderingTraderTakeDamageFromWater = getBoolean("mobs.wandering_trader.takes-damage-from-water", wanderingTraderTakeDamageFromWater);