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

Drop projectile despawn rates patch in favor of pufferfish's

Browse Source 
Fixes elBukkit/MagicPlugin#1042
Fixes elBukkit/MagicPlugin#816
This commit is contained in:
BillyGalbreath
2022-06-13 10:46:27 -05:00
parent c5dbf9cf10
commit 146750b2de
193 changed files with 978 additions and 1244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0009-Configurable-entity-base-attributes.patch
View File

@@ -1464,10 +1464,10 @@ index 2ae9a5da91ad20f1b566a686dcc8d4f14c62ecc5..8bfa041297db79e8f1452ce7059d1536
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 4efbb008bd31a0316d3ceead6be27c6d38dd9f50..bf4c17c61dcc230286fe9ce4cb0855f0f710aad0 100644
index 2521c6f055b1631979cf281dc158c5f25623c259..74029209c431a709341161da6a0ac719188d5fac 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -109,94 +109,166 @@ public class PurpurWorldConfig {
@@ -112,94 +112,166 @@ public class PurpurWorldConfig {
public boolean axolotlRidable = false;
public boolean axolotlControllable = true;
@@ -1634,7 +1634,7 @@ index 4efbb008bd31a0316d3ceead6be27c6d38dd9f50..bf4c17c61dcc230286fe9ce4cb0855f0
}
public boolean dolphinRidable = false;
@@ -204,80 +276,161 @@ public class PurpurWorldConfig {
@@ -207,80 +279,161 @@ public class PurpurWorldConfig {
public int dolphinSpitCooldown = 20;
public float dolphinSpitSpeed = 1.0F;
public float dolphinSpitDamage = 2.0F;
@@ -1796,7 +1796,7 @@ index 4efbb008bd31a0316d3ceead6be27c6d38dd9f50..bf4c17c61dcc230286fe9ce4cb0855f0
}
public boolean frogRidable = false;
@@ -295,147 +448,316 @@ public class PurpurWorldConfig {
@@ -298,147 +451,316 @@ public class PurpurWorldConfig {
public boolean ghastRidableInWater = false;
public boolean ghastControllable = true;
public double ghastMaxY = 320D;
@@ -2113,7 +2113,7 @@ index 4efbb008bd31a0316d3ceead6be27c6d38dd9f50..bf4c17c61dcc230286fe9ce4cb0855f0
}
public boolean phantomRidable = false;
@@ -445,6 +767,10 @@ public class PurpurWorldConfig {
@@ -448,6 +770,10 @@ public class PurpurWorldConfig {
public float phantomFlameDamage = 1.0F;
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
@@ -2124,7 +2124,7 @@ index 4efbb008bd31a0316d3ceead6be27c6d38dd9f50..bf4c17c61dcc230286fe9ce4cb0855f0
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -453,180 +779,350 @@ public class PurpurWorldConfig {
@@ -456,180 +782,350 @@ public class PurpurWorldConfig {
phantomFlameDamage = (float) getDouble("mobs.phantom.flames.damage", phantomFlameDamage);
phantomFlameFireTime = getInt("mobs.phantom.flames.fire-time", phantomFlameFireTime);
phantomAllowGriefing = getBoolean("mobs.phantom.allow-griefing", phantomAllowGriefing);
@@ -2475,7 +2475,7 @@ index 4efbb008bd31a0316d3ceead6be27c6d38dd9f50..bf4c17c61dcc230286fe9ce4cb0855f0
}
public boolean tadpoleRidable = false;
@@ -641,64 +1137,125 @@ public class PurpurWorldConfig {
@@ -644,64 +1140,125 @@ public class PurpurWorldConfig {
public boolean traderLlamaRidable = false;
public boolean traderLlamaRidableInWater = false;
public boolean traderLlamaControllable = true;
@@ -2601,7 +2601,7 @@ index 4efbb008bd31a0316d3ceead6be27c6d38dd9f50..bf4c17c61dcc230286fe9ce4cb0855f0
}
public boolean wardenRidable = false;
@@ -713,81 +1270,165 @@ public class PurpurWorldConfig {
@@ -716,81 +1273,165 @@ public class PurpurWorldConfig {
public boolean witchRidable = false;
public boolean witchRidableInWater = false;
public boolean witchControllable = true;