add portal-wait-time options for player

This commit is contained in:
granny
2023-05-16 18:40:29 -07:00
parent 3b02c0439a
commit 68117a4e35
59 changed files with 363 additions and 341 deletions

View File

@@ -32,10 +32,10 @@ index db6ee0ef067c42dd7f3a69cc796e2dd2c8fc059d..5718d70cdc4f5afb14320a20c3e72362
// 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 d8a5cf270e4af7daa71b2ac68d7da25bceefe44d..df92283920356712464c31560a1c9eec21dee86e 100644
index f2e6a0948530aa0830dc417cb56c7fb78a4cc483..f33621315bbf65c79917f766dea1896d55cd5322 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1279,6 +1279,7 @@ public class PurpurWorldConfig {
@@ -1283,6 +1283,7 @@ public class PurpurWorldConfig {
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
@@ -43,7 +43,7 @@ index d8a5cf270e4af7daa71b2ac68d7da25bceefe44d..df92283920356712464c31560a1c9eec
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1296,6 +1297,7 @@ public class PurpurWorldConfig {
@@ -1300,6 +1301,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 d8a5cf270e4af7daa71b2ac68d7da25bceefe44d..df92283920356712464c31560a1c9eec
}
public boolean dolphinRidable = false;
@@ -2082,6 +2084,7 @@ public class PurpurWorldConfig {
@@ -2086,6 +2088,7 @@ public class PurpurWorldConfig {
public boolean piglinTakeDamageFromWater = false;
public int piglinPortalSpawnModifier = 2000;
public boolean piglinAlwaysDropExp = false;
@@ -59,7 +59,7 @@ index d8a5cf270e4af7daa71b2ac68d7da25bceefe44d..df92283920356712464c31560a1c9eec
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -2096,6 +2099,7 @@ public class PurpurWorldConfig {
@@ -2100,6 +2103,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 d8a5cf270e4af7daa71b2ac68d7da25bceefe44d..df92283920356712464c31560a1c9eec
}
public boolean piglinBruteRidable = false;
@@ -2357,6 +2361,7 @@ public class PurpurWorldConfig {
@@ -2361,6 +2365,7 @@ public class PurpurWorldConfig {
public double skeletonMaxHealth = 20.0D;
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
@@ -75,7 +75,7 @@ index d8a5cf270e4af7daa71b2ac68d7da25bceefe44d..df92283920356712464c31560a1c9eec
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2369,6 +2374,7 @@ public class PurpurWorldConfig {
@@ -2373,6 +2378,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 d8a5cf270e4af7daa71b2ac68d7da25bceefe44d..df92283920356712464c31560a1c9eec
}
public boolean skeletonHorseRidableInWater = true;
@@ -2903,6 +2909,7 @@ public class PurpurWorldConfig {
@@ -2907,6 +2913,7 @@ public class PurpurWorldConfig {
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
@@ -91,7 +91,7 @@ index d8a5cf270e4af7daa71b2ac68d7da25bceefe44d..df92283920356712464c31560a1c9eec
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2921,6 +2928,7 @@ public class PurpurWorldConfig {
@@ -2925,6 +2932,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);