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

Resolve #286 - Add config and API for item immunity to lightning

Browse Source
This commit is contained in:
BillyGalbreath
2021-05-03 13:32:36 -05:00
parent a86555bb5d
commit 83665826a9
98 changed files with 362 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
patches/server/0125-Make-entity-breeding-times-configurable.patch
View File

@@ -428,10 +428,10 @@ index 64253428ef66145d07f74f8d0e5bdeb5aa5fe02b..828d01abe8202a246ce07c1c652a17cb
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9bc3aff37addd694f840eea6189d47e9131e1f27..c70a22d8c5d8cdab04e923b22002ae35e703485e 100644
index b92715b115332e8197d5a02a2f308a1ab0f447b6..bd37234624a720c1077aabf0123de61a0d4e05cb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -482,10 +482,12 @@ public class PurpurWorldConfig {
@@ -492,10 +492,12 @@ public class PurpurWorldConfig {
public boolean beeRidable = false;
public boolean beeRidableInWater = false;
public double beeMaxY = 256D;
@@ -444,7 +444,7 @@ index 9bc3aff37addd694f840eea6189d47e9131e1f27..c70a22d8c5d8cdab04e923b22002ae35
}
public boolean blazeRidable = false;
@@ -502,12 +504,14 @@ public class PurpurWorldConfig {
@@ -512,12 +514,14 @@ public class PurpurWorldConfig {
public int catSpawnDelay = 1200;
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
@@ -459,7 +459,7 @@ index 9bc3aff37addd694f840eea6189d47e9131e1f27..c70a22d8c5d8cdab04e923b22002ae35
}
public boolean caveSpiderRidable = false;
@@ -520,10 +524,12 @@ public class PurpurWorldConfig {
@@ -530,10 +534,12 @@ public class PurpurWorldConfig {
public boolean chickenRidable = false;
public boolean chickenRidableInWater = false;
public boolean chickenRetaliate = false;
@@ -472,7 +472,7 @@ index 9bc3aff37addd694f840eea6189d47e9131e1f27..c70a22d8c5d8cdab04e923b22002ae35
}
public boolean codRidable = false;
@@ -534,10 +540,12 @@ public class PurpurWorldConfig {
@@ -544,10 +550,12 @@ public class PurpurWorldConfig {
public boolean cowRidable = false;
public boolean cowRidableInWater = false;
public int cowFeedMushrooms = 0;
@@ -485,7 +485,7 @@ index 9bc3aff37addd694f840eea6189d47e9131e1f27..c70a22d8c5d8cdab04e923b22002ae35
}
public boolean creeperRidable = false;
@@ -565,8 +573,10 @@ public class PurpurWorldConfig {
@@ -575,8 +583,10 @@ public class PurpurWorldConfig {
}
public boolean donkeyRidableInWater = false;
@@ -496,7 +496,7 @@ index 9bc3aff37addd694f840eea6189d47e9131e1f27..c70a22d8c5d8cdab04e923b22002ae35
}
public boolean drownedRidable = false;
@@ -624,10 +634,12 @@ public class PurpurWorldConfig {
@@ -634,10 +644,12 @@ public class PurpurWorldConfig {
public boolean foxRidable = false;
public boolean foxRidableInWater = false;
public boolean foxTypeChangesWithTulips = false;
@@ -509,7 +509,7 @@ index 9bc3aff37addd694f840eea6189d47e9131e1f27..c70a22d8c5d8cdab04e923b22002ae35
}
public boolean ghastRidable = false;
@@ -672,14 +684,18 @@ public class PurpurWorldConfig {
@@ -682,14 +694,18 @@ public class PurpurWorldConfig {
public boolean hoglinRidable = false;
public boolean hoglinRidableInWater = false;
@@ -528,7 +528,7 @@ index 9bc3aff37addd694f840eea6189d47e9131e1f27..c70a22d8c5d8cdab04e923b22002ae35
}
public boolean huskRidable = false;
@@ -724,9 +740,11 @@ public class PurpurWorldConfig {
@@ -734,9 +750,11 @@ public class PurpurWorldConfig {
public boolean llamaRidable = false;
public boolean llamaRidableInWater = false;
@@ -540,7 +540,7 @@ index 9bc3aff37addd694f840eea6189d47e9131e1f27..c70a22d8c5d8cdab04e923b22002ae35
}
public boolean llamaTraderRidable = false;
@@ -745,28 +763,36 @@ public class PurpurWorldConfig {
@@ -755,28 +773,36 @@ public class PurpurWorldConfig {
public boolean mooshroomRidable = false;
public boolean mooshroomRidableInWater = false;
@@ -577,7 +577,7 @@ index 9bc3aff37addd694f840eea6189d47e9131e1f27..c70a22d8c5d8cdab04e923b22002ae35
}
public boolean parrotRidable = false;
@@ -832,10 +858,12 @@ public class PurpurWorldConfig {
@@ -842,10 +868,12 @@ public class PurpurWorldConfig {
public boolean pigRidable = false;
public boolean pigRidableInWater = false;
public boolean pigGiveSaddleBack = false;
@@ -590,7 +590,7 @@ index 9bc3aff37addd694f840eea6189d47e9131e1f27..c70a22d8c5d8cdab04e923b22002ae35
}
public boolean piglinRidable = false;
@@ -863,12 +891,14 @@ public class PurpurWorldConfig {
@@ -873,12 +901,14 @@ public class PurpurWorldConfig {
public boolean polarBearRidableInWater = false;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -605,7 +605,7 @@ index 9bc3aff37addd694f840eea6189d47e9131e1f27..c70a22d8c5d8cdab04e923b22002ae35
}
public boolean pufferfishRidable = false;
@@ -880,11 +910,13 @@ public class PurpurWorldConfig {
@@ -890,11 +920,13 @@ public class PurpurWorldConfig {
public boolean rabbitRidableInWater = false;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -619,7 +619,7 @@ index 9bc3aff37addd694f840eea6189d47e9131e1f27..c70a22d8c5d8cdab04e923b22002ae35
}
public boolean ravagerRidable = false;
@@ -901,9 +933,11 @@ public class PurpurWorldConfig {
@@ -911,9 +943,11 @@ public class PurpurWorldConfig {
public boolean sheepRidable = false;
public boolean sheepRidableInWater = false;
@@ -631,7 +631,7 @@ index 9bc3aff37addd694f840eea6189d47e9131e1f27..c70a22d8c5d8cdab04e923b22002ae35
}
public boolean shulkerRidable = false;
@@ -981,9 +1015,11 @@ public class PurpurWorldConfig {
@@ -991,9 +1025,11 @@ public class PurpurWorldConfig {
public boolean striderRidable = false;
public boolean striderRidableInWater = false;
@@ -643,7 +643,7 @@ index 9bc3aff37addd694f840eea6189d47e9131e1f27..c70a22d8c5d8cdab04e923b22002ae35
}
public boolean tropicalFishRidable = false;
@@ -993,9 +1029,11 @@ public class PurpurWorldConfig {
@@ -1003,9 +1039,11 @@ public class PurpurWorldConfig {
public boolean turtleRidable = false;
public boolean turtleRidableInWater = false;
@@ -655,7 +655,7 @@ index 9bc3aff37addd694f840eea6189d47e9131e1f27..c70a22d8c5d8cdab04e923b22002ae35
}
public boolean vexRidable = false;
@@ -1017,6 +1055,7 @@ public class PurpurWorldConfig {
@@ -1027,6 +1065,7 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
@@ -663,7 +663,7 @@ index 9bc3aff37addd694f840eea6189d47e9131e1f27..c70a22d8c5d8cdab04e923b22002ae35
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1028,6 +1067,7 @@ public class PurpurWorldConfig {
@@ -1038,6 +1077,7 @@ public class PurpurWorldConfig {
villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
@@ -671,7 +671,7 @@ index 9bc3aff37addd694f840eea6189d47e9131e1f27..c70a22d8c5d8cdab04e923b22002ae35
}
public boolean villagerTraderRidable = false;
@@ -1088,9 +1128,11 @@ public class PurpurWorldConfig {
@@ -1098,9 +1138,11 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;