Add item immunities option for cactus

This commit is contained in:
BillyGalbreath
2021-01-15 10:18:43 -06:00
parent 7356e48485
commit adcd1d2847
65 changed files with 239 additions and 215 deletions

View File

@@ -398,10 +398,10 @@ index 9ae7168595dd66860e09ef87f946b18b010e54b1..6c25f667eecdf345289a0dbf885c9d71
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 309d15804eb7e5087805724c401461375b4745cc..ef0c2320780c623df4dd638c9272110a2fb2e530 100644
index 3075467164d6ce4b5fc570297eb6ace27f9aee03..0f23e96dd6cc109eed3d6ec1c04ac9c36d462ed6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -416,10 +416,12 @@ public class PurpurWorldConfig {
@@ -422,10 +422,12 @@ public class PurpurWorldConfig {
public boolean beeRidable = false;
public boolean beeRidableInWater = false;
public double beeMaxY = 256D;
@@ -414,7 +414,7 @@ index 309d15804eb7e5087805724c401461375b4745cc..ef0c2320780c623df4dd638c9272110a
}
public boolean blazeRidable = false;
@@ -436,12 +438,14 @@ public class PurpurWorldConfig {
@@ -442,12 +444,14 @@ public class PurpurWorldConfig {
public int catSpawnDelay = 1200;
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
@@ -429,7 +429,7 @@ index 309d15804eb7e5087805724c401461375b4745cc..ef0c2320780c623df4dd638c9272110a
}
public boolean caveSpiderRidable = false;
@@ -454,10 +458,12 @@ public class PurpurWorldConfig {
@@ -460,10 +464,12 @@ public class PurpurWorldConfig {
public boolean chickenRidable = false;
public boolean chickenRidableInWater = false;
public boolean chickenRetaliate = false;
@@ -442,7 +442,7 @@ index 309d15804eb7e5087805724c401461375b4745cc..ef0c2320780c623df4dd638c9272110a
}
public boolean codRidable = false;
@@ -468,10 +474,12 @@ public class PurpurWorldConfig {
@@ -474,10 +480,12 @@ public class PurpurWorldConfig {
public boolean cowRidable = false;
public boolean cowRidableInWater = false;
public int cowFeedMushrooms = 0;
@@ -455,7 +455,7 @@ index 309d15804eb7e5087805724c401461375b4745cc..ef0c2320780c623df4dd638c9272110a
}
public boolean creeperRidable = false;
@@ -499,8 +507,10 @@ public class PurpurWorldConfig {
@@ -505,8 +513,10 @@ public class PurpurWorldConfig {
}
public boolean donkeyRidableInWater = false;
@@ -466,7 +466,7 @@ index 309d15804eb7e5087805724c401461375b4745cc..ef0c2320780c623df4dd638c9272110a
}
public boolean drownedRidable = false;
@@ -560,10 +570,12 @@ public class PurpurWorldConfig {
@@ -566,10 +576,12 @@ public class PurpurWorldConfig {
public boolean foxRidable = false;
public boolean foxRidableInWater = false;
public boolean foxTypeChangesWithTulips = false;
@@ -479,7 +479,7 @@ index 309d15804eb7e5087805724c401461375b4745cc..ef0c2320780c623df4dd638c9272110a
}
public boolean ghastRidable = false;
@@ -608,14 +620,18 @@ public class PurpurWorldConfig {
@@ -614,14 +626,18 @@ public class PurpurWorldConfig {
public boolean hoglinRidable = false;
public boolean hoglinRidableInWater = false;
@@ -498,7 +498,7 @@ index 309d15804eb7e5087805724c401461375b4745cc..ef0c2320780c623df4dd638c9272110a
}
public boolean huskRidable = false;
@@ -660,9 +676,11 @@ public class PurpurWorldConfig {
@@ -666,9 +682,11 @@ public class PurpurWorldConfig {
public boolean llamaRidable = false;
public boolean llamaRidableInWater = false;
@@ -510,7 +510,7 @@ index 309d15804eb7e5087805724c401461375b4745cc..ef0c2320780c623df4dd638c9272110a
}
public boolean llamaTraderRidable = false;
@@ -681,28 +699,36 @@ public class PurpurWorldConfig {
@@ -687,28 +705,36 @@ public class PurpurWorldConfig {
public boolean mooshroomRidable = false;
public boolean mooshroomRidableInWater = false;
@@ -547,7 +547,7 @@ index 309d15804eb7e5087805724c401461375b4745cc..ef0c2320780c623df4dd638c9272110a
}
public boolean parrotRidable = false;
@@ -766,10 +792,12 @@ public class PurpurWorldConfig {
@@ -772,10 +798,12 @@ public class PurpurWorldConfig {
public boolean pigRidable = false;
public boolean pigRidableInWater = false;
public boolean pigGiveSaddleBack = false;
@@ -560,7 +560,7 @@ index 309d15804eb7e5087805724c401461375b4745cc..ef0c2320780c623df4dd638c9272110a
}
public boolean piglinRidable = false;
@@ -797,12 +825,14 @@ public class PurpurWorldConfig {
@@ -803,12 +831,14 @@ public class PurpurWorldConfig {
public boolean polarBearRidableInWater = false;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -575,7 +575,7 @@ index 309d15804eb7e5087805724c401461375b4745cc..ef0c2320780c623df4dd638c9272110a
}
public boolean pufferfishRidable = false;
@@ -814,11 +844,13 @@ public class PurpurWorldConfig {
@@ -820,11 +850,13 @@ public class PurpurWorldConfig {
public boolean rabbitRidableInWater = false;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -589,7 +589,7 @@ index 309d15804eb7e5087805724c401461375b4745cc..ef0c2320780c623df4dd638c9272110a
}
public boolean ravagerRidable = false;
@@ -835,9 +867,11 @@ public class PurpurWorldConfig {
@@ -841,9 +873,11 @@ public class PurpurWorldConfig {
public boolean sheepRidable = false;
public boolean sheepRidableInWater = false;
@@ -601,7 +601,7 @@ index 309d15804eb7e5087805724c401461375b4745cc..ef0c2320780c623df4dd638c9272110a
}
public boolean shulkerRidable = false;
@@ -915,9 +949,11 @@ public class PurpurWorldConfig {
@@ -921,9 +955,11 @@ public class PurpurWorldConfig {
public boolean striderRidable = false;
public boolean striderRidableInWater = false;
@@ -613,7 +613,7 @@ index 309d15804eb7e5087805724c401461375b4745cc..ef0c2320780c623df4dd638c9272110a
}
public boolean tropicalFishRidable = false;
@@ -927,9 +963,11 @@ public class PurpurWorldConfig {
@@ -933,9 +969,11 @@ public class PurpurWorldConfig {
public boolean turtleRidable = false;
public boolean turtleRidableInWater = false;
@@ -625,7 +625,7 @@ index 309d15804eb7e5087805724c401461375b4745cc..ef0c2320780c623df4dd638c9272110a
}
public boolean vexRidable = false;
@@ -1022,9 +1060,11 @@ public class PurpurWorldConfig {
@@ -1028,9 +1066,11 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;