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

remove rainglow patch in favor of paper plugin impl

Browse Source 
https://modrinth.com/plugin/rainglow-paper

supersedes #1351
This commit is contained in:
granny
2023-06-20 17:25:29 -07:00
parent d22455b2a3
commit 625e4adbd8
217 changed files with 919 additions and 1048 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 e2a9179bb7a5ecbc31d98a2410a09f5e2107234b..8fd8778e918566504666213a102a7ee2
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 3fb96a14928d24920999336a40920f0a4db65e9b..315144150854861df1d9d0f8dce877dad7d73812 100644
index 2991d62374c1db54a4fa4d97b993073254c53074..a066066c81811d1eb813ec13173cd58efb2ad9df 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 {
@@ -2128,6 +2128,7 @@ public class PurpurWorldConfig {
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
public boolean villagerTakeDamageFromWater = false;
@@ -42,7 +42,7 @@ index 3fb96a14928d24920999336a40920f0a4db65e9b..315144150854861df1d9d0f8dce877da
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2147,6 +2148,7 @@ public class PurpurWorldConfig {
@@ -2146,6 +2147,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 3fb96a14928d24920999336a40920f0a4db65e9b..315144150854861df1d9d0f8dce877da
}
public boolean vindicatorRidable = false;
@@ -2176,6 +2178,7 @@ public class PurpurWorldConfig {
@@ -2175,6 +2177,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
public boolean wanderingTraderTakeDamageFromWater = false;
@@ -58,7 +58,7 @@ index 3fb96a14928d24920999336a40920f0a4db65e9b..315144150854861df1d9d0f8dce877da
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 {
@@ -2188,6 +2191,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);