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

More base attribute stuff

Browse Source
This commit is contained in:
BillyGalbreath
2020-12-21 01:08:44 -06:00
parent 43d6dabb27
commit 3d1926e6e0
4 changed files with 769 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

915
patches/server/0160-Configurable-entity-base-attributes.patch
View File

File diff suppressed because it is too large Load Diff

12
patches/server/0161-Phantom-flames-on-swoop.patch
View File

@@ -17,10 +17,10 @@ index 889e388cf13ba0a385ee88a3acd0b813c0776dee..d6509eef1dc26beafc752c8518eabfec
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3384a55fd77386961c1a63cd5e3359ea8ca5986d..7842a904730999484334cd391a0ce623c184a0bb 100644
index 0db403f19e0131a8a49d28bc7bd3534b2b76c3b7..66aaa47a5221cc025ca142b0cef70b3eb311bf4c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -910,6 +910,7 @@ public class PurpurWorldConfig {
@@ -1127,6 +1127,7 @@ public class PurpurWorldConfig {
public int phantomBurnInLight = 0;
public boolean phantomIgnorePlayersWithTorch = false;
public boolean phantomBurnInDaylight = true;
@@ -28,11 +28,11 @@ index 3384a55fd77386961c1a63cd5e3359ea8ca5986d..7842a904730999484334cd391a0ce623
public double phantomMaxHealth = 20.0D;
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
@@ -935,6 +936,7 @@ public class PurpurWorldConfig {
@@ -1152,6 +1153,7 @@ public class PurpurWorldConfig {
phantomBurnInLight = getInt("mobs.phantom.burn-in-light", phantomBurnInLight);
phantomBurnInDaylight = getBoolean("mobs.phantom.burn-in-daylight", phantomBurnInDaylight);
phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch);
+ phantomFlamesOnSwoop = getBoolean("mobs.phantom.flames-on-swoop", phantomFlamesOnSwoop);
phantomMaxHealth = getDouble("mobs.phantom.attributes.max-health", phantomMaxHealth);
}
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.phantom.attributes.max-health", phantomMaxHealth);
set("mobs.phantom.attributes.max-health", null);

2
patches/server/0162-Option-for-chests-to-open-even-with-a-solid-block-on.patch
View File

@@ -17,7 +17,7 @@ index 9e5e6de52efabe9126f6c47acb35fa1dc461ff4f..487b281cf53d3482853d56ee1e90a329
return iblockaccess.getType(blockposition1).isOccluding(iblockaccess, blockposition1);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7842a904730999484334cd391a0ce623c184a0bb..ac742813f49496923d40a70dd46aada0b904d89a 100644
index 66aaa47a5221cc025ca142b0cef70b3eb311bf4c..480e3a30d42bfd0cc0344762361fc3523f148799 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -370,6 +370,11 @@ public class PurpurWorldConfig {

14
patches/server/0164-Striders-give-saddle-back.patch
View File

@@ -28,20 +28,20 @@ index 1bb33c4169902cf6eb323f79a5d98a1df5726d96..96485d6f4db6b618413abc23199bdb9c
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ac742813f49496923d40a70dd46aada0b904d89a..c875127f0bcc7c40a670419b7a41a75f7721d58c 100644
index 480e3a30d42bfd0cc0344762361fc3523f148799..57702bdf36efeb19b01fa88a0de62b875e2e2400 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1153,11 +1153,13 @@ public class PurpurWorldConfig {
@@ -1480,11 +1480,13 @@ public class PurpurWorldConfig {
public boolean striderRidable = false;
public boolean striderRidableInWater = false;
public int striderBreedingTicks = 6000;
public double striderMaxHealth = 20.0D;
+ public boolean striderGiveSaddleBack = false;
public double striderMaxHealth = 20.0D;
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);
striderMaxHealth = getDouble("mobs.strider.attributes.max-health", striderMaxHealth);
+ striderGiveSaddleBack = getBoolean("mobs.strider.give-saddle-back", striderGiveSaddleBack);
}
public boolean tropicalFishRidable = false;
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.strider.attributes.max-health", striderMaxHealth);
set("mobs.strider.attributes.max-health", null);