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

synchronize patches

Browse Source
This commit is contained in:
granny
2023-06-09 05:07:46 -07:00
parent 9bed3af997
commit e4edcee766
113 changed files with 703 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0234-Mob-head-visibility-percent.patch
View File

@@ -32,10 +32,10 @@ index 7a35d45f8449a8399cb417357f0f0a6419bfbe3a..39ee6fbc6ce17b61abf88deba69b0ade
// Purpur start
if (entity instanceof LivingEntity entityliving) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ccaed082001b197719af4eaca8d5eb84a41606c3..5ebf050a48506a4dc97e2df357e57ee315a5b6b8 100644
index f6ff629afaa70fd4a1f689fc92ca061887e5be87..953c796e72650c300f6d9f591fd167c2449a6482 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1283,6 +1283,7 @@ public class PurpurWorldConfig {
@@ -1288,6 +1288,7 @@ public class PurpurWorldConfig {
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
@@ -43,7 +43,7 @@ index ccaed082001b197719af4eaca8d5eb84a41606c3..5ebf050a48506a4dc97e2df357e57ee3
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1300,6 +1301,7 @@ public class PurpurWorldConfig {
@@ -1305,6 +1306,7 @@ public class PurpurWorldConfig {
creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);
creeperHealthRadius = getBoolean("mobs.creeper.health-impacts-explosion", creeperHealthRadius);
creeperAlwaysDropExp = getBoolean("mobs.creeper.always-drop-exp", creeperAlwaysDropExp);
@@ -51,7 +51,7 @@ index ccaed082001b197719af4eaca8d5eb84a41606c3..5ebf050a48506a4dc97e2df357e57ee3
}
public boolean dolphinRidable = false;
@@ -2086,6 +2088,7 @@ public class PurpurWorldConfig {
@@ -2091,6 +2093,7 @@ public class PurpurWorldConfig {
public boolean piglinTakeDamageFromWater = false;
public int piglinPortalSpawnModifier = 2000;
public boolean piglinAlwaysDropExp = false;
@@ -59,7 +59,7 @@ index ccaed082001b197719af4eaca8d5eb84a41606c3..5ebf050a48506a4dc97e2df357e57ee3
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -2100,6 +2103,7 @@ public class PurpurWorldConfig {
@@ -2105,6 +2108,7 @@ public class PurpurWorldConfig {
piglinTakeDamageFromWater = getBoolean("mobs.piglin.takes-damage-from-water", piglinTakeDamageFromWater);
piglinPortalSpawnModifier = getInt("mobs.piglin.portal-spawn-modifier", piglinPortalSpawnModifier);
piglinAlwaysDropExp = getBoolean("mobs.piglin.always-drop-exp", piglinAlwaysDropExp);
@@ -67,7 +67,7 @@ index ccaed082001b197719af4eaca8d5eb84a41606c3..5ebf050a48506a4dc97e2df357e57ee3
}
public boolean piglinBruteRidable = false;
@@ -2361,6 +2365,7 @@ public class PurpurWorldConfig {
@@ -2366,6 +2370,7 @@ public class PurpurWorldConfig {
public double skeletonMaxHealth = 20.0D;
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
@@ -75,7 +75,7 @@ index ccaed082001b197719af4eaca8d5eb84a41606c3..5ebf050a48506a4dc97e2df357e57ee3
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2373,6 +2378,7 @@ public class PurpurWorldConfig {
@@ -2378,6 +2383,7 @@ public class PurpurWorldConfig {
skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
@@ -83,7 +83,7 @@ index ccaed082001b197719af4eaca8d5eb84a41606c3..5ebf050a48506a4dc97e2df357e57ee3
}
public boolean skeletonHorseRidableInWater = true;
@@ -2907,6 +2913,7 @@ public class PurpurWorldConfig {
@@ -2912,6 +2918,7 @@ public class PurpurWorldConfig {
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
@@ -91,7 +91,7 @@ index ccaed082001b197719af4eaca8d5eb84a41606c3..5ebf050a48506a4dc97e2df357e57ee3
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2925,6 +2932,7 @@ public class PurpurWorldConfig {
@@ -2930,6 +2937,7 @@ public class PurpurWorldConfig {
zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
zombieAlwaysDropExp = getBoolean("mobs.zombie.always-drop-exp", zombieAlwaysDropExp);