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

Move more options to per-world section (still more to come)

Browse Source
This commit is contained in:
William Blake Galbreath
2020-01-14 19:33:01 -06:00
parent bee0cc833b
commit a221240eef
35 changed files with 298 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
patches/server/0022-Always-place-dragon-egg-when-dragon-is-killed.patch
View File

@@ -1,50 +1,49 @@
From 56a6ad31a83bcc34ddc66196beaf9a7047455db5 Mon Sep 17 00:00:00 2001
From 4a49933497d7955879f09d161ca3b9ed2af58cde Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 1 Jun 2019 01:16:35 -0500
Subject: [PATCH] Always place dragon egg when dragon is killed
---
.../net/minecraft/server/EnderDragonBattle.java | 2 +-
src/main/java/net/pl3x/purpur/PurpurConfig.java | 13 +++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
src/main/java/net/minecraft/server/EnderDragonBattle.java | 4 ++--
src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
index 218c04245b..cfc059c00f 100644
index 218c04245b..a2dfdc23f1 100644
--- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
+++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
@@ -21,7 +21,7 @@ public class EnderDragonBattle {
private static final Logger LOGGER = LogManager.getLogger();
private static final Predicate<Entity> b = IEntitySelector.a.and(IEntitySelector.a(0.0D, 128.0D, 0.0D, 192.0D));
public final BossBattleServer bossBattle;
- private final WorldServer d;
+ private final WorldServer d; public WorldServer getWorld() { return d; } // Purpur - OBFHELPER
private final List<Integer> e;
private final ShapeDetector f;
private int g;
@@ -358,7 +358,7 @@ public class EnderDragonBattle {
this.bossBattle.setVisible(false);
this.a(true);
this.n();
- if (!this.l) {
+ if (net.pl3x.purpur.PurpurConfig.enderDragonAlwaysDropsEggBlock || !this.l) { // Purpur - always place dragon egg
+ if (getWorld().purpurConfig.enderDragonAlwaysDropsEggBlock || !this.l) { // Purpur - always place dragon egg
this.d.setTypeUpdate(this.d.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, WorldGenEndTrophy.a), Blocks.DRAGON_EGG.getBlockData());
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 4c25d358fd..4baede017c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -142,6 +142,19 @@ public class PurpurConfig {
feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index abd10a500a..f91019986c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -103,4 +103,9 @@ public class PurpurWorldConfig {
private void allowSignColors() {
allowSignColors = getBoolean("allow-sign-colors", allowSignColors);
}
+ public static boolean enderDragonAlwaysDropsEggBlock = false;
+ private static void enderDragonSettings() {
+ if (version < 2) {
+ if (config.isSet("ender-dragon-death-always-places-egg-block")) {
+ enderDragonAlwaysDropsEggBlock = config.getBoolean("ender-dragon-death-always-places-egg-block", enderDragonAlwaysDropsEggBlock);
+ }
+ if (config.isSet("settings.ender-dragon-death-always-places-egg-block")) {
+ enderDragonAlwaysDropsEggBlock = config.getBoolean("settings.ender-dragon-death-always-places-egg-block", enderDragonAlwaysDropsEggBlock);
+ }
+ }
+ enderDragonAlwaysDropsEggBlock = getBoolean("settings.mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
+ }
+
public static boolean giantsNaturallySpawn = true;
public static boolean giantsHaveAI = true;
private static void giantsSettings() {
+ public boolean enderDragonAlwaysDropsEggBlock = false;
+ private void enderDragonSettings() {
+ enderDragonAlwaysDropsEggBlock = getBoolean("mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
+ }
}
--
2.24.0.rc1
2.24.0

16
patches/server/0024-Add-config-for-items-breaking-turtle-eggs.patch
View File

@@ -1,4 +1,4 @@
From 9e203340843bfb499a69eabf211866d002b0d77f Mon Sep 17 00:00:00 2001
From 5daded8219c8a600f6ad744e0efdab29ff5958a1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 22:15:46 -0500
Subject: [PATCH] Add config for items breaking turtle eggs
@@ -32,19 +32,21 @@ index cb36334e41..238d260b5f 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index abd10a500a..5c5a729e9e 100644
index f91019986c..37bd83271b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -103,4 +103,9 @@ public class PurpurWorldConfig {
private void allowSignColors() {
@@ -104,6 +104,11 @@ public class PurpurWorldConfig {
allowSignColors = getBoolean("allow-sign-colors", allowSignColors);
}
+
+ public boolean itemsCanBreakTurtleEggs = false;
+ private void itemsCanBreakTurtleEggs() {
+ itemsCanBreakTurtleEggs = getBoolean("items-can-break-turtle-eggs", itemsCanBreakTurtleEggs);
+ }
}
+
public boolean enderDragonAlwaysDropsEggBlock = false;
private void enderDragonSettings() {
enderDragonAlwaysDropsEggBlock = getBoolean("mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
--
2.24.0.rc1
2.24.0

10
patches/server/0025-Make-Iron-Golems-Swim.patch
View File

@@ -1,4 +1,4 @@
From c8327292a86bc1848b9f0bbddcdd9be674010c46 Mon Sep 17 00:00:00 2001
From cba4d0db3f9bee98b1149a3c1a680ba66bf56070 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 15 Jun 2019 03:12:15 -0500
Subject: [PATCH] Make Iron Golems Swim
@@ -9,7 +9,7 @@ Subject: [PATCH] Make Iron Golems Swim
2 files changed, 6 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
index 6a41e1cfd0..966cefdcf6 100644
index 63b88f454b..dbdc200ec3 100644
--- a/src/main/java/net/minecraft/server/EntityIronGolem.java
+++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
@@ -20,6 +20,7 @@ public class EntityIronGolem extends EntityGolem {
@@ -21,10 +21,10 @@ index 6a41e1cfd0..966cefdcf6 100644
this.goalSelector.a(1, new PathfinderGoalMeleeAttack(this, 1.0D, true));
this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F));
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 4baede017c..5dc8822884 100644
index 19fe36b0ba..26c855b1cc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -162,6 +162,11 @@ public class PurpurConfig {
@@ -149,6 +149,11 @@ public class PurpurConfig {
giantsHaveAI = getBoolean("settings.mobs.giant.have-ai", giantsHaveAI);
}
@@ -37,5 +37,5 @@ index 4baede017c..5dc8822884 100644
public static float crystalsAttackPhantomDamage = 1.0F;
public static double phantomsOrbitCrystalsRadius = 0.0D;
--
2.24.0.rc1
2.24.0

14
patches/server/0027-Controllable-Minecarts.patch
View File

@@ -1,4 +1,4 @@
From ccee67878634f3a7fe20b8946b0a96e4abd4962b Mon Sep 17 00:00:00 2001
From a5861c7ad2d16003948379c308f64b0eb6baa80d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 29 Jun 2019 02:32:40 -0500
Subject: [PATCH] Controllable Minecarts
@@ -11,7 +11,7 @@ Subject: [PATCH] Controllable Minecarts
4 files changed, 75 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index c40d3b56b..36d11cfdf 100644
index c40d3b56b1..36d11cfdf2 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1283,6 +1283,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -23,7 +23,7 @@ index c40d3b56b..36d11cfdf 100644
return this.inLava;
}
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
index 4388186db..5abd8a181 100644
index 4388186db5..5abd8a1819 100644
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -8,6 +8,7 @@ import java.util.List;
@@ -86,7 +86,7 @@ index 4388186db..5abd8a181 100644
this.setMot(new Vec3D(this.getMot().x * this.derailedX, this.getMot().y * this.derailedY, this.getMot().z * this.derailedZ));
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/ItemMinecart.java b/src/main/java/net/minecraft/server/ItemMinecart.java
index b73e317fb..aa2186add 100644
index b73e317fbb..aa2186add7 100644
--- a/src/main/java/net/minecraft/server/ItemMinecart.java
+++ b/src/main/java/net/minecraft/server/ItemMinecart.java
@@ -103,8 +103,10 @@ public class ItemMinecart extends Item {
@@ -111,7 +111,7 @@ index b73e317fb..aa2186add 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 5e416727f..a94169e75 100644
index 26c855b1cc..fce20c66ee 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -1,9 +1,13 @@
@@ -128,7 +128,7 @@ index 5e416727f..a94169e75 100644
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.event.inventory.InventoryType;
@@ -313,4 +317,30 @@ public class PurpurConfig {
@@ -300,4 +304,30 @@ public class PurpurConfig {
ridableZombiePigman = getBoolean("settings.ridable.zombie_pigman", ridableZombiePigman);
ridableZombieVillager = getBoolean("settings.ridable.zombie_villager", ridableZombieVillager);
}
@@ -160,5 +160,5 @@ index 5e416727f..a94169e75 100644
+ }
}
--
2.24.0.rc1
2.24.0

12
patches/server/0029-Make-illusioners-naturally-spawn.patch
View File

@@ -1,4 +1,4 @@
From 701e2a2dc2cb3606020f4cf416c6858b52872efd Mon Sep 17 00:00:00 2001
From cee8d638411f39049d6764ee0de64eb8c852c496 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 5 Jul 2019 11:09:25 -0500
Subject: [PATCH] Make illusioners naturally spawn
@@ -10,7 +10,7 @@ Subject: [PATCH] Make illusioners naturally spawn
3 files changed, 27 insertions(+)
diff --git a/src/main/java/net/minecraft/server/Biomes.java b/src/main/java/net/minecraft/server/Biomes.java
index b075ee4ec..48dcab2d9 100644
index d1f8695fee..27e82af009 100644
--- a/src/main/java/net/minecraft/server/Biomes.java
+++ b/src/main/java/net/minecraft/server/Biomes.java
@@ -112,6 +112,24 @@ public abstract class Biomes {
@@ -39,7 +39,7 @@ index b075ee4ec..48dcab2d9 100644
private static void addSpawn(String biome, EnumCreatureType ct, EntityTypes et, int weight, int min_group, int max_group) {
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index 694075cb1..966ef81c6 100644
index 53d5900411..8576a7d97a 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -82,6 +82,10 @@ public final class SpawnerCreature {
@@ -54,10 +54,10 @@ index 694075cb1..966ef81c6 100644
// Purpur end
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index f9623c7c7..aa68cc366 100644
index d6af361467..b14a4a57cc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -171,6 +171,11 @@ public class PurpurConfig {
@@ -158,6 +158,11 @@ public class PurpurConfig {
giantsHaveAI = getBoolean("settings.mobs.giant.have-ai", giantsHaveAI);
}
@@ -70,5 +70,5 @@ index f9623c7c7..aa68cc366 100644
private static void ironGolemSettings() {
ironGolemSwims = getBoolean("settings.mobs.iron_golem.swims", ironGolemSwims);
--
2.23.0.rc1
2.24.0

34
patches/server/0034-Add-chance-for-zombie-horse-natural-spawns.patch
View File

@@ -1,15 +1,15 @@
From 3aaa5a6281ff8a911e3f6623bfc8dba4e2990ef1 Mon Sep 17 00:00:00 2001
From 2a316cadda007eae32884eef898e21ec252771e3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 7 Jul 2019 19:52:16 -0500
Subject: [PATCH] Add chance for zombie horse natural spawns
---
.../java/net/minecraft/server/WorldServer.java | 18 ++++++++++++------
.../java/net/pl3x/purpur/PurpurConfig.java | 5 +++++
.../net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 8526a3fda1..a299fbf96a 100644
index 8526a3fda1..fbfe37ea0a 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -549,12 +549,18 @@ public class WorldServer extends World {
@@ -24,7 +24,7 @@ index 8526a3fda1..a299fbf96a 100644
- this.addEntity(entityhorseskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
+ // Purpur start
+ EntityHorseAbstract horse;
+ if (net.pl3x.purpur.PurpurConfig.zombieHorseSpawnChance > 0F && random.nextFloat() <= net.pl3x.purpur.PurpurConfig.zombieHorseSpawnChance) {
+ if (purpurConfig.zombieHorseSpawnChance > 0F && random.nextFloat() <= purpurConfig.zombieHorseSpawnChance) {
+ horse = EntityTypes.ZOMBIE_HORSE.a(this);
+ } else {
+ horse = EntityTypes.SKELETON_HORSE.a(this);
@@ -37,22 +37,20 @@ index 8526a3fda1..a299fbf96a 100644
}
this.strikeLightning(new EntityLightning(this, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, flag1), org.bukkit.event.weather.LightningStrikeEvent.Cause.WEATHER); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 5114296777..3389d626af 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -207,6 +207,11 @@ public class PurpurConfig {
snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c053aec937..993906ba42 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -118,4 +118,9 @@ public class PurpurWorldConfig {
private void enderDragonSettings() {
enderDragonAlwaysDropsEggBlock = getBoolean("mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
}
+ public static float zombieHorseSpawnChance = 0F;
+ private static void zombieHorseSettings() {
+ zombieHorseSpawnChance = (float) getDouble("settings.mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
+ }
+
public static boolean largeEnderChests = true;
private static void largeEnderChests() {
largeEnderChests = getBoolean("settings.large-ender-chests", largeEnderChests);
+ public float zombieHorseSpawnChance = 0F;
+ private void zombieHorseSettings() {
+ zombieHorseSpawnChance = (float) getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
+ }
}
--
2.24.0

38
patches/server/0035-Fix-pig-zombies-MC-56653.patch
View File

@@ -1,22 +1,22 @@
From d2c8b1879fd458f8cdc7a0679c9ce2ec2e3fb300 Mon Sep 17 00:00:00 2001
From acedbc60518eb695950bf5d604b8c1744a2890d2 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 9 Jul 2019 20:56:47 -0500
Subject: [PATCH] Fix pig zombies (MC-56653)
---
src/main/java/net/minecraft/server/EntityPigZombie.java | 9 ++++++++-
src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++
src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
index 8d57c5f1b5..1c3be1c2c0 100644
index 8d57c5f1b5..0a0ecaf197 100644
--- a/src/main/java/net/minecraft/server/EntityPigZombie.java
+++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
@@ -139,6 +139,7 @@ public class EntityPigZombie extends EntityZombie {
boolean result = super.damageEntity(damagesource, f);
if (result && entity instanceof EntityHuman && !((EntityHuman) entity).isCreative() && this.hasLineOfSight(entity)) {
+ if (net.pl3x.purpur.PurpurConfig.pigmenDontTargetUnlessHit) this.setLastDamager((EntityHuman) entity); // Purpur - fix MC-56653
+ if (world.purpurConfig.pigmenDontTargetUnlessHit) this.setLastDamager((EntityHuman) entity); // Purpur - fix MC-56653
this.i((EntityLiving) entity);
}
@@ -25,7 +25,7 @@ index 8d57c5f1b5..1c3be1c2c0 100644
// CraftBukkit end
this.soundDelay = this.random.nextInt(40);
- this.setLastDamager(entityliving);
+ if (!net.pl3x.purpur.PurpurConfig.pigmenDontTargetUnlessHit) this.setLastDamager(entityliving); // Purpur - fix MC-56653
+ if (!world.purpurConfig.pigmenDontTargetUnlessHit) this.setLastDamager(entityliving); // Purpur - fix MC-56653
return true;
}
@@ -35,29 +35,29 @@ index 8d57c5f1b5..1c3be1c2c0 100644
+ // Purpur start - fix MC-56653
+ protected boolean isDropExperience() {
+ return super.isDropExperience() && (!net.pl3x.purpur.PurpurConfig.pigmenDontTargetUnlessHit || getLastDamager() instanceof EntityHuman);
+ return super.isDropExperience() && (!world.purpurConfig.pigmenDontTargetUnlessHit || getLastDamager() instanceof EntityHuman);
+ }
+ // Purpur end
+
static class PathfinderGoalAnger extends PathfinderGoalNearestAttackableTarget<EntityHuman> {
public PathfinderGoalAnger(EntityPigZombie entitypigzombie) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index f0ed3c9749..8a875a5764 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -200,6 +200,11 @@ public class PurpurConfig {
phantomsOrbitCrystalsRadius = getDouble("settings.mobs.phantom.orbit-crystal-radius", phantomsOrbitCrystalsRadius);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 993906ba42..704c0cd47f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -119,6 +119,11 @@ public class PurpurWorldConfig {
enderDragonAlwaysDropsEggBlock = getBoolean("mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
}
+ public static boolean pigmenDontTargetUnlessHit = false;
+ private static void pigmenSettings() {
+ pigmenDontTargetUnlessHit = getBoolean("settings.mobs.pigmen.dont-target-unless-hit", pigmenDontTargetUnlessHit);
+ public boolean pigmenDontTargetUnlessHit = false;
+ private void pigmenSettings() {
+ pigmenDontTargetUnlessHit = getBoolean("mobs.pigmen.dont-target-unless-hit", pigmenDontTargetUnlessHit);
+ }
+
public static boolean snowmanDropsPumpkin = false;
public static boolean snowmanPumpkinPutBack = false;
private static void snowmansSettings() {
public float zombieHorseSpawnChance = 0F;
private void zombieHorseSettings() {
zombieHorseSpawnChance = (float) getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
--
2.24.0.rc1
2.24.0

18
patches/server/0036-Option-to-toggle-milk-curing-bad-omen.patch
View File

@@ -1,4 +1,4 @@
From 69541720f176d5362e4068f683bbfe095c611094 Mon Sep 17 00:00:00 2001
From d78331ff5b753953f661acd3461591d5bf32c310 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Wed, 10 Jul 2019 20:43:05 -0500
Subject: [PATCH] Option to toggle milk curing bad omen
@@ -9,7 +9,7 @@ Subject: [PATCH] Option to toggle milk curing bad omen
2 files changed, 7 insertions(+)
diff --git a/src/main/java/net/minecraft/server/ItemMilkBucket.java b/src/main/java/net/minecraft/server/ItemMilkBucket.java
index a6477d26a..f76e611ca 100644
index b7dd5e3c07..93131de75c 100644
--- a/src/main/java/net/minecraft/server/ItemMilkBucket.java
+++ b/src/main/java/net/minecraft/server/ItemMilkBucket.java
@@ -20,7 +20,9 @@ public class ItemMilkBucket extends Item {
@@ -23,19 +23,21 @@ index a6477d26a..f76e611ca 100644
return itemstack.isEmpty() ? new ItemStack(Items.BUCKET) : itemstack;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 038c2ac07..a6f014a05 100644
index 704c0cd47f..24adf973c1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -113,4 +113,9 @@ public class PurpurWorldConfig {
private void itemsCanBreakTurtleEggs() {
@@ -114,6 +114,11 @@ public class PurpurWorldConfig {
itemsCanBreakTurtleEggs = getBoolean("items-can-break-turtle-eggs", itemsCanBreakTurtleEggs);
}
+
+ public boolean milkCuresBadOmen = false;
+ private void milkCuresBadOmen() {
+ milkCuresBadOmen = getBoolean("milk-cures-bad-omen", milkCuresBadOmen);
+ }
}
+
public boolean enderDragonAlwaysDropsEggBlock = false;
private void enderDragonSettings() {
enderDragonAlwaysDropsEggBlock = getBoolean("mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
--
2.23.0.rc1
2.24.0

41
patches/server/0037-Tulips-change-fox-type.patch
View File

@@ -1,16 +1,16 @@
From 67679f626cafda7a0341786a1b741f6c59aef6ff Mon Sep 17 00:00:00 2001
From 56a5007877edd368d86f64159e68b4c36f03e01b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 13 Jul 2019 15:56:22 -0500
Subject: [PATCH] Tulips change fox type
---
.../java/net/minecraft/server/EntityFox.java | 26 +++++++++++++++++++
.../java/net/minecraft/server/EntityFox.java | 27 +++++++++++++++++++
src/main/java/net/minecraft/server/Items.java | 4 +--
.../java/net/pl3x/purpur/PurpurConfig.java | 5 ++++
3 files changed, 33 insertions(+), 2 deletions(-)
.../net/pl3x/purpur/PurpurWorldConfig.java | 5 ++++
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
index 66078b484c..0f6d9e3c4e 100644
index 2156c86be8..b7e853790e 100644
--- a/src/main/java/net/minecraft/server/EntityFox.java
+++ b/src/main/java/net/minecraft/server/EntityFox.java
@@ -228,6 +228,11 @@ public class EntityFox extends EntityAnimal {
@@ -33,12 +33,13 @@ index 66078b484c..0f6d9e3c4e 100644
}
private List<UUID> eE() {
@@ -605,6 +611,26 @@ public class EntityFox extends EntityAnimal {
@@ -605,6 +611,27 @@ public class EntityFox extends EntityAnimal {
return getRider() == null ? super.dp() : 0.5F;
}
+ @Override
+ public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
+ if (net.pl3x.purpur.PurpurConfig.tulipsChangeFoxType) {
+ if (world.purpurConfig.foxTypeChangesWithTulips) {
+ ItemStack itemstack = entityhuman.b(enumhand);
+ if (getFoxType() == Type.RED && itemstack.getItem() == Items.WHITE_TULIP) {
+ setFoxType(Type.SNOW);
@@ -75,22 +76,22 @@ index 282fbca4fc..b261da87b7 100644
public static final Item bc = a(Blocks.PINK_TULIP, CreativeModeTab.c);
public static final Item bd = a(Blocks.OXEYE_DAISY, CreativeModeTab.c);
public static final Item be = a(Blocks.CORNFLOWER, CreativeModeTab.c);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 8a875a5764..ef00ce307e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -174,6 +174,11 @@ public class PurpurConfig {
enderDragonAlwaysDropsEggBlock = getBoolean("settings.mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 24adf973c1..de3511aa6b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -124,6 +124,11 @@ public class PurpurWorldConfig {
enderDragonAlwaysDropsEggBlock = getBoolean("mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
}
+ public static boolean tulipsChangeFoxType = true;
+ private static void foxSettings() {
+ tulipsChangeFoxType = getBoolean("settings.mobs.fox.tulips-change-type", tulipsChangeFoxType);
+ public boolean foxTypeChangesWithTulips = true;
+ private void foxSettings() {
+ foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
+ }
+
public static boolean giantsNaturallySpawn = true;
public static boolean giantsHaveAI = true;
private static void giantsSettings() {
public boolean pigmenDontTargetUnlessHit = false;
private void pigmenSettings() {
pigmenDontTargetUnlessHit = getBoolean("mobs.pigmen.dont-target-unless-hit", pigmenDontTargetUnlessHit);
--
2.24.0.rc1
2.24.0

16
patches/server/0041-Implement-a-hard-limit-for-pillager-outpost-spawns.patch
View File

@@ -1,4 +1,4 @@
From 05225cd7543552bff6a28d35f4f47ada032c514d Mon Sep 17 00:00:00 2001
From 80a6a769ebd4823a3231f0015c2bc1e1acb198d0 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Mon, 22 Jul 2019 14:24:26 -0500
Subject: [PATCH] Implement a hard limit for pillager outpost spawns
@@ -21,19 +21,21 @@ index 70f43c5159..baca8f7054 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a6f014a050..c6de971ac5 100644
index de3511aa6b..5539c33996 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -118,4 +118,9 @@ public class PurpurWorldConfig {
private void milkCuresBadOmen() {
milkCuresBadOmen = getBoolean("milk-cures-bad-omen", milkCuresBadOmen);
@@ -134,6 +134,11 @@ public class PurpurWorldConfig {
pigmenDontTargetUnlessHit = getBoolean("mobs.pigmen.dont-target-unless-hit", pigmenDontTargetUnlessHit);
}
+
+ public int pillagerLimitOutpostSpawns = 10;
+ private void pillagerSettings() {
+ pillagerLimitOutpostSpawns = getInt("mobs.pillager.limit-outpost-spawns", pillagerLimitOutpostSpawns);
+ }
}
+
public float zombieHorseSpawnChance = 0F;
private void zombieHorseSettings() {
zombieHorseSpawnChance = (float) getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
--
2.24.0

14
patches/server/0042-Implement-configurable-search-radius-for-villagers-t.patch
View File

@@ -1,4 +1,4 @@
From 2b50b40a4d96a235826d2702936bd1f1afc2bc55 Mon Sep 17 00:00:00 2001
From 050790025bea61c40983bb5eb93eb11f6e36d74a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Mon, 22 Jul 2019 17:32:17 -0500
Subject: [PATCH] Implement configurable search radius for villagers to spawn
@@ -41,21 +41,23 @@ index 5727230058..daa9544453 100644
int i = 0;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c6de971ac5..9dddfd8155 100644
index 5539c33996..e31727c7e9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -123,4 +123,11 @@ public class PurpurWorldConfig {
private void pillagerSettings() {
@@ -139,6 +139,13 @@ public class PurpurWorldConfig {
pillagerLimitOutpostSpawns = getInt("mobs.pillager.limit-outpost-spawns", pillagerLimitOutpostSpawns);
}
+
+ public int villagerSpawnIronGolemRadius = 0;
+ public int villagerSpawnIronGolemLimit = 5;
+ private void villagerSettings() {
+ villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
+ villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
+ }
}
+
public float zombieHorseSpawnChance = 0F;
private void zombieHorseSettings() {
zombieHorseSpawnChance = (float) getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
--
2.24.0

12
patches/server/0044-Implement-configurable-villager-brain-ticks.patch
View File

@@ -1,4 +1,4 @@
From 0e366064ed25e7255921af0e4acc532ca38ca52d Mon Sep 17 00:00:00 2001
From d744f9a25cb9abcacac69541ced6cc0bf4acf046 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 08:28:21 -0500
Subject: [PATCH] Implement configurable villager brain ticks
@@ -40,10 +40,10 @@ index daa9544453..7d146d9783 100644
this.world.getMethodProfiler().exit();
if (!this.et() && this.bB > 0) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index cccb966df0..2abdea8731 100644
index de0cf5c55e..c35d19f66f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -232,6 +232,13 @@ public class PurpurConfig {
@@ -209,6 +209,13 @@ public class PurpurConfig {
snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
}
@@ -54,9 +54,9 @@ index cccb966df0..2abdea8731 100644
+ villagerBrainTicks = getInt("settings.mobs.villager.brain-ticks", villagerBrainTicks);
+ }
+
public static float zombieHorseSpawnChance = 0F;
private static void zombieHorseSettings() {
zombieHorseSpawnChance = (float) getDouble("settings.mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
public static boolean largeEnderChests = true;
private static void largeEnderChests() {
largeEnderChests = getBoolean("settings.large-ender-chests", largeEnderChests);
--
2.24.0

10
patches/server/0045-Implement-elytra-settings.patch
View File

@@ -1,4 +1,4 @@
From 9e23a1e16c112c6d72cfa9f5e15888c48fed3be6 Mon Sep 17 00:00:00 2001
From d31953fe6ca7247b4cadc3f15b9d4a17b97378b3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 25 Jul 2019 18:07:37 -0500
Subject: [PATCH] Implement elytra settings
@@ -123,7 +123,7 @@ index 212af252be..fbc30e6ece 100644
return this.x * this.x + this.y * this.y + this.z * this.z;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9dddfd8155..06d6275809 100644
index e31727c7e9..d2879d3833 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -119,6 +119,19 @@ public class PurpurWorldConfig {
@@ -143,9 +143,9 @@ index 9dddfd8155..06d6275809 100644
+ elytraDamagePerTridentBoost = getInt("elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
+ }
+
public int pillagerLimitOutpostSpawns = 10;
private void pillagerSettings() {
pillagerLimitOutpostSpawns = getInt("mobs.pillager.limit-outpost-spawns", pillagerLimitOutpostSpawns);
public boolean enderDragonAlwaysDropsEggBlock = false;
private void enderDragonSettings() {
enderDragonAlwaysDropsEggBlock = getBoolean("mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
--
2.24.0

16
patches/server/0050-Implement-AFK-API.patch
View File

@@ -1,4 +1,4 @@
From 3a01733c19a4960d0e0ff4e512234666fd0aae84 Mon Sep 17 00:00:00 2001
From bc8b7d1ee0c0ad83ae767780dfeb5beb58a6d299 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 8 Aug 2019 15:29:15 -0500
Subject: [PATCH] Implement AFK API
@@ -205,7 +205,7 @@ index a4af019bc6..2db59c55ca 100644
if (from.getX() != Double.MAX_VALUE) {
Location oldTo = to.clone();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index a299fbf96a..bc02c54526 100644
index fbfe37ea0a..4dfcce82de 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -376,7 +376,7 @@ public class WorldServer extends World {
@@ -227,7 +227,7 @@ index a299fbf96a..bc02c54526 100644
} else if (entityplayer.isSleeping()) {
++j;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 06d6275809..259f6fa287 100644
index d2879d3833..17950a8245 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,6 +1,7 @@
@@ -238,8 +238,8 @@ index 06d6275809..259f6fa287 100644
import org.bukkit.configuration.file.YamlConfiguration;
import org.spigotmc.SpigotWorldConfig;
@@ -132,6 +133,21 @@ public class PurpurWorldConfig {
elytraDamagePerTridentBoost = getInt("elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
@@ -109,6 +110,21 @@ public class PurpurWorldConfig {
allowSignColors = getBoolean("allow-sign-colors", allowSignColors);
}
+ public boolean idleTimeoutKick = true;
@@ -257,9 +257,9 @@ index 06d6275809..259f6fa287 100644
+ idleTimeoutBroadcastBack = ChatColor.translateAlternateColorCodes('&', getString("idle-timeout.broadcast.back", idleTimeoutBroadcastBack));
+ }
+
public int pillagerLimitOutpostSpawns = 10;
private void pillagerSettings() {
pillagerLimitOutpostSpawns = getInt("mobs.pillager.limit-outpost-spawns", pillagerLimitOutpostSpawns);
public boolean itemsCanBreakTurtleEggs = false;
private void itemsCanBreakTurtleEggs() {
itemsCanBreakTurtleEggs = getBoolean("items-can-break-turtle-eggs", itemsCanBreakTurtleEggs);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3afcfeae11..df9e5c6593 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java

34
patches/server/0052-Add-option-for-zombies-targetting-turtle-eggs.patch
View File

@@ -1,15 +1,15 @@
From a306a2d8ef846c4944889f35b3288afab222ad28 Mon Sep 17 00:00:00 2001
From 298180158709cdd2f19ed901f2944fb36bd8c1f3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 17 Aug 2019 15:27:09 -0500
Subject: [PATCH] Add option for zombies targetting turtle eggs
---
src/main/java/net/minecraft/server/EntityZombie.java | 2 +-
src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++
src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index 8f9d252c1e..47248cc45e 100644
index 8f9d252c1e..e9da244d98 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -48,7 +48,7 @@ public class EntityZombie extends EntityMonster {
@@ -17,26 +17,26 @@ index 8f9d252c1e..47248cc45e 100644
protected void initPathfinder() {
this.goalSelector.a(0, new net.pl3x.purpur.pathfinder.PathfinderGoalHasRider(this)); // Purpur
- this.goalSelector.a(4, new EntityZombie.a(this, 1.0D, 3));
+ if (net.pl3x.purpur.PurpurConfig.zombieTargetsTurtleEggs)this.goalSelector.a(4, new EntityZombie.a(this, 1.0D, 3)); // Purpur
+ if (world.purpurConfig.zombieTargetsTurtleEggs)this.goalSelector.a(4, new EntityZombie.a(this, 1.0D, 3)); // Purpur
this.goalSelector.a(8, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 8.0F));
this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
this.l();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 0fa7faa996..e6a8f9fb84 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -256,6 +256,11 @@ public class PurpurConfig {
villagerBrainTicks = getInt("settings.mobs.villager.brain-ticks", villagerBrainTicks);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 17950a8245..603ae7d8be 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -175,6 +175,11 @@ public class PurpurWorldConfig {
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
}
+ public static boolean zombieTargetsTurtleEggs = true;
+ private static void zombieSettings() {
+ zombieTargetsTurtleEggs = getBoolean("settings.mobs.zombie.target-turtle-eggs", zombieTargetsTurtleEggs);
+ public boolean zombieTargetsTurtleEggs = true;
+ private void zombieSettings() {
+ zombieTargetsTurtleEggs = getBoolean("mobs.zombie.target-turtle-eggs", zombieTargetsTurtleEggs);
+ }
+
public static float zombieHorseSpawnChance = 0F;
private static void zombieHorseSettings() {
zombieHorseSpawnChance = (float) getDouble("settings.mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
public float zombieHorseSpawnChance = 0F;
private void zombieHorseSettings() {
zombieHorseSpawnChance = (float) getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
--
2.24.0.rc1
2.24.0

12
patches/server/0054-Option-for-slimes-not-pushable.patch
View File

@@ -1,4 +1,4 @@
From be230534a636a8e41534507f33e443d993ee09ad Mon Sep 17 00:00:00 2001
From 34a74b47613d54bec307dd0792344914f9081b11 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 23 Aug 2019 21:56:31 -0500
Subject: [PATCH] Option for slimes not pushable
@@ -10,7 +10,7 @@ Subject: [PATCH] Option for slimes not pushable
3 files changed, 32 insertions(+)
diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
index b29525c40..3a47df79f 100644
index b29525c40d..3a47df79f3 100644
--- a/src/main/java/net/minecraft/server/BlockPiston.java
+++ b/src/main/java/net/minecraft/server/BlockPiston.java
@@ -10,6 +10,8 @@ import java.util.Map.Entry;
@@ -40,7 +40,7 @@ index b29525c40..3a47df79f 100644
if (event.isCancelled()) {
diff --git a/src/main/java/net/minecraft/server/BlockSlime.java b/src/main/java/net/minecraft/server/BlockSlime.java
index 01f32659d..52ab86f0b 100644
index 01f32659d9..52ab86f0b1 100644
--- a/src/main/java/net/minecraft/server/BlockSlime.java
+++ b/src/main/java/net/minecraft/server/BlockSlime.java
@@ -49,4 +49,11 @@ public class BlockSlime extends BlockHalfTransparent {
@@ -56,10 +56,10 @@ index 01f32659d..52ab86f0b 100644
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 9465fc13e..fc0c8f2f4 100644
index 4f6ec93991..a511c83cca 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -278,6 +278,19 @@ public class PurpurConfig {
@@ -245,6 +245,19 @@ public class PurpurConfig {
InventoryType.BARREL.setDefaultSize(packedBarrels ? 54 : 27);
}
@@ -80,5 +80,5 @@ index 9465fc13e..fc0c8f2f4 100644
public static boolean ridableBee = true;
public static boolean ridableBlaze = true;
--
2.24.0.rc1
2.24.0

37
patches/server/0055-Ender-Dragon-always-drops-full-exp.patch
View File

@@ -1,15 +1,15 @@
From abf73c2baed8515f9e2d6d9664b859685c42ffed Mon Sep 17 00:00:00 2001
From 000015edf660a1af0c6c7bd66e0b6de9b9870672 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 24 Aug 2019 14:42:54 -0500
Subject: [PATCH] Ender Dragon always drops full exp
---
src/main/java/net/minecraft/server/EntityEnderDragon.java | 2 +-
src/main/java/net/pl3x/purpur/PurpurConfig.java | 2 ++
src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
index 5935ecb529..c7db47ae93 100644
index 5935ecb529..19395a9349 100644
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -567,7 +567,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -17,30 +17,25 @@ index 5935ecb529..c7db47ae93 100644
short short0 = 500;
- if (this.bN != null && !this.bN.d()) {
+ if (net.pl3x.purpur.PurpurConfig.enderDragonAlwaysDropsFullExp || (this.bN != null && !this.bN.d())) { // Purpur
+ if (world.purpurConfig.enderDragonAlwaysDropsFullExp || (this.bN != null && !this.bN.d())) { // Purpur
short0 = 12000;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 94ca1e0bcb..26ac853132 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -194,6 +194,7 @@ public class PurpurConfig {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e4de91a658..e8f1db88f1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -156,8 +156,10 @@ public class PurpurWorldConfig {
}
public static boolean enderDragonAlwaysDropsEggBlock = false;
+ public static boolean enderDragonAlwaysDropsFullExp = false;
private static void enderDragonSettings() {
if (version < 2) {
if (config.isSet("ender-dragon-death-always-places-egg-block")) {
@@ -204,6 +205,7 @@ public class PurpurConfig {
}
}
enderDragonAlwaysDropsEggBlock = getBoolean("settings.mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
+ enderDragonAlwaysDropsFullExp = getBoolean("settings.mobs.ender-dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
public boolean enderDragonAlwaysDropsEggBlock = false;
+ public boolean enderDragonAlwaysDropsFullExp = false;
private void enderDragonSettings() {
enderDragonAlwaysDropsEggBlock = getBoolean("mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
+ enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender-dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
}
public static boolean tulipsChangeFoxType = true;
public boolean foxTypeChangesWithTulips = true;
--
2.24.0.rc1
2.24.0

10
patches/server/0057-Add-killer-rabbit-natural-spawn-chance.patch
View File

@@ -1,4 +1,4 @@
From cd12c4564c9432cf757dd71443dc72b6ca809c62 Mon Sep 17 00:00:00 2001
From 90280796ba7cf39404b3a8432fc6d17f708dbaa6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 31 Aug 2019 17:24:41 -0500
Subject: [PATCH] Add killer rabbit natural spawn chance
@@ -22,11 +22,11 @@ index d36a074c89..c8de748664 100644
int i = this.random.nextInt(100);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 26ac853132..3e96f63dbe 100644
index a511c83cca..1b1e4ca25b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -244,6 +244,11 @@ public class PurpurConfig {
pigmenDontTargetUnlessHit = getBoolean("settings.mobs.pigmen.dont-target-unless-hit", pigmenDontTargetUnlessHit);
@@ -219,6 +219,11 @@ public class PurpurConfig {
phantomsOrbitCrystalsRadius = getDouble("settings.mobs.phantom.orbit-crystal-radius", phantomsOrbitCrystalsRadius);
}
+ public static double killerRabbitChance = 0.0D;
@@ -38,5 +38,5 @@ index 26ac853132..3e96f63dbe 100644
public static boolean snowmanPumpkinPutBack = false;
private static void snowmansSettings() {
--
2.24.0.rc1
2.24.0

8
patches/server/0058-Add-option-to-spawn-Toast.patch
View File

@@ -1,4 +1,4 @@
From 2654372002db43e578e7d72832a91b1223ceb2b7 Mon Sep 17 00:00:00 2001
From 705a01f181413de4d7805c15bc2610f9dd928c67 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 31 Aug 2019 17:47:11 -0500
Subject: [PATCH] Add option to spawn Toast
@@ -30,10 +30,10 @@ index c8de748664..35b8e182c6 100644
BiomeBase biomebase = generatoraccess.getBiome(new BlockPosition(this));
int i = this.random.nextInt(100);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 3e96f63dbe..569c5b3442 100644
index 1b1e4ca25b..0537d06811 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -245,8 +245,10 @@ public class PurpurConfig {
@@ -220,8 +220,10 @@ public class PurpurConfig {
}
public static double killerRabbitChance = 0.0D;
@@ -45,5 +45,5 @@ index 3e96f63dbe..569c5b3442 100644
public static boolean snowmanDropsPumpkin = false;
--
2.24.0.rc1
2.24.0

8
patches/server/0060-Allow-leashing-villagers.patch
View File

@@ -1,4 +1,4 @@
From a439ab2a24f3776c3e58df37c7462b0af13f7fec Mon Sep 17 00:00:00 2001
From 165280da5a0937b3e5717965e9c7bfcae83b2e52 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 3 Oct 2019 18:08:03 -0500
Subject: [PATCH] Allow leashing villagers
@@ -38,10 +38,10 @@ index 7d146d9783..4187bb6026 100644
+ // Purpur - end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 1d6627cf05..12638c8169 100644
index 0537d06811..8298a12769 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -260,9 +260,11 @@ public class PurpurConfig {
@@ -235,9 +235,11 @@ public class PurpurConfig {
public static boolean useVillagerBrainTicksOnlyWhenLagging = true;
public static int villagerBrainTicks = 20;
@@ -52,7 +52,7 @@ index 1d6627cf05..12638c8169 100644
+ allowLeashingVillagers = getBoolean("settings.mobs.villager.allow-leashing", allowLeashingVillagers);
}
public static boolean zombieTargetsTurtleEggs = true;
public static boolean largeEnderChests = true;
--
2.24.0

10
patches/server/0072-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
View File

@@ -1,4 +1,4 @@
From 7142824e543bed1c563977106dcc855ee7f76e4f Mon Sep 17 00:00:00 2001
From bd25f55b2b0d9689844b8cc6f6b33718ed8dfefb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 02:20:45 -0500
Subject: [PATCH] Add option to allow iron golems to spawn in air
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option to allow iron golems to spawn in air
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
index 966cefdcf6..9ed5672d78 100644
index dbdc200ec3..314cb7fcfe 100644
--- a/src/main/java/net/minecraft/server/EntityIronGolem.java
+++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
@@ -224,7 +224,7 @@ public class EntityIronGolem extends EntityGolem {
@@ -22,10 +22,10 @@ index 966cefdcf6..9ed5672d78 100644
} else {
for (int i = 1; i < 3; ++i) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index af808d0367..d05d69df10 100644
index 7e06cd044e..148fc22ff7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -241,8 +241,10 @@ public class PurpurConfig {
@@ -221,8 +221,10 @@ public class PurpurConfig {
}
public static boolean ironGolemSwims = true;
@@ -37,5 +37,5 @@ index af808d0367..d05d69df10 100644
public static double crystalsAttackPhantomsRadius = 0.0D;
--
2.24.0.rc1
2.24.0

18
patches/server/0079-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch
View File

@@ -1,23 +1,21 @@
From 8cd2f55a5d205378ff704811df327682f4cd1546 Mon Sep 17 00:00:00 2001
From 8b10da757f42d39ad07a17029d7f57173a9238da Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 03:53:54 -0500
Subject: [PATCH] Add back EntityCreatePortalEvent for EnderDragon
---
.../minecraft/server/EnderDragonBattle.java | 57 ++++++++++++++++---
1 file changed, 49 insertions(+), 8 deletions(-)
.../minecraft/server/EnderDragonBattle.java | 55 ++++++++++++++++---
1 file changed, 48 insertions(+), 7 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
index cfc059c00f..a2cb2693a4 100644
index a2dfdc23f1..935d73f822 100644
--- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
+++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
@@ -21,8 +21,8 @@ public class EnderDragonBattle {
private static final Logger LOGGER = LogManager.getLogger();
@@ -22,7 +22,7 @@ public class EnderDragonBattle {
private static final Predicate<Entity> b = IEntitySelector.a.and(IEntitySelector.a(0.0D, 128.0D, 0.0D, 192.0D));
public final BossBattleServer bossBattle;
- private final WorldServer d;
private final WorldServer d; public WorldServer getWorld() { return d; } // Purpur - OBFHELPER
- private final List<Integer> e;
+ private final WorldServer d; public WorldServer getWorld() { return d; } // Purpur - OBFHELPER
+ private final List<Integer> e; public List<Integer> getGateways() { return e; } // Purpur - OBFHELPER
private final ShapeDetector f;
private int g;
@@ -30,7 +28,7 @@ index cfc059c00f..a2cb2693a4 100644
- this.n();
+ spawnExitPortal(entityenderdragon); // Purpur
+ spawnGateway(entityenderdragon); // Purpur
if (net.pl3x.purpur.PurpurConfig.enderDragonAlwaysDropsEggBlock || !this.l) { // Purpur - always place dragon egg
if (getWorld().purpurConfig.enderDragonAlwaysDropsEggBlock || !this.l) { // Purpur - always place dragon egg
this.d.setTypeUpdate(this.d.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, WorldGenEndTrophy.a), Blocks.DRAGON_EGG.getBlockData());
}
@@ -368,21 +368,62 @@ public class EnderDragonBattle {
@@ -101,5 +99,5 @@ index cfc059c00f..a2cb2693a4 100644
WorldGenEndTrophy worldgenendtrophy = new WorldGenEndTrophy(flag);
--
2.24.0.rc1
2.24.0

6
patches/server/0080-Implement-infinite-lava.patch
View File

@@ -1,4 +1,4 @@
From ce2b6d10538fe243152dd6d7ba55804488795233 Mon Sep 17 00:00:00 2001
From b838cc63bdc601ca165c0ddf060b7e0262963acf Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 23 Nov 2019 17:55:42 -0600
Subject: [PATCH] Implement infinite lava
@@ -69,10 +69,10 @@ index 9eba9a12c0..39252e6873 100644
protected boolean c;
protected boolean d;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 10c659da7a..006dcd225c 100644
index 2df15feb81..49472a0531 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -144,6 +144,11 @@ public class PurpurWorldConfig {
@@ -159,6 +159,11 @@ public class PurpurWorldConfig {
milkCuresBadOmen = getBoolean("milk-cures-bad-omen", milkCuresBadOmen);
}

10
patches/server/0081-Phantoms-only-attack-insomniacs.patch
View File

@@ -1,4 +1,4 @@
From 8c66e5748d306678a0c33f2e4bf5eb7ed40f29c4 Mon Sep 17 00:00:00 2001
From ce7d5e2bf70c4e628dcfcaa3bf2f3ccc8c388d35 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 29 Nov 2019 20:33:41 -0600
Subject: [PATCH] Phantoms only attack insomniacs
@@ -40,10 +40,10 @@ index 71c61dc45e..becf9d29e2 100644
public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
double d4 = d3 * d3;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 37e9d13886..68db82759d 100644
index 148fc22ff7..46dc8cf79a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -250,10 +250,12 @@ public class PurpurConfig {
@@ -230,10 +230,12 @@ public class PurpurConfig {
public static double crystalsAttackPhantomsRadius = 0.0D;
public static float crystalsAttackPhantomDamage = 1.0F;
public static double phantomsOrbitCrystalsRadius = 0.0D;
@@ -55,7 +55,7 @@ index 37e9d13886..68db82759d 100644
+ phantomsOnlyAttackInsomniacs = getBoolean("settings.mobs.phantom.only-attack-insomniacs", phantomsOnlyAttackInsomniacs);
}
public static boolean pigmenDontTargetUnlessHit = false;
public static double killerRabbitChance = 0.0D;
--
2.24.0.rc1
2.24.0

8
patches/server/0082-Villagers-follow-emerald-blocks.patch
View File

@@ -1,4 +1,4 @@
From 3f64c9d3b117dfff3f18d61e4510e362242c1436 Mon Sep 17 00:00:00 2001
From 385090164807e54ddd4dca86616de161b6d7fb8f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 29 Nov 2019 22:10:12 -0600
Subject: [PATCH] Villagers follow emerald blocks
@@ -37,10 +37,10 @@ index 4187bb6026..d8cbe549d4 100644
public BehaviorController<EntityVillager> getBehaviorController() {
return (BehaviorController<EntityVillager>) super.getBehaviorController(); // CraftBukkit - decompile error
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 66f524ebf8..cc4731ccc8 100644
index 46dc8cf79a..81f41ccc77 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -280,10 +280,12 @@ public class PurpurConfig {
@@ -255,10 +255,12 @@ public class PurpurConfig {
public static boolean useVillagerBrainTicksOnlyWhenLagging = true;
public static int villagerBrainTicks = 20;
public static boolean allowLeashingVillagers = false;
@@ -52,7 +52,7 @@ index 66f524ebf8..cc4731ccc8 100644
+ villagersFollowEmeraldBlocks = getBoolean("settings.mobs.villager.follow-emerald-blocks", villagersFollowEmeraldBlocks);
}
public static boolean zombieTargetsTurtleEggs = true;
public static boolean largeEnderChests = true;
--
2.24.0

14
patches/server/0083-Add-charged-creeper-spawn-chance.patch
View File

@@ -1,4 +1,4 @@
From 3a270f96763f004d959fc1d455972c2dac4a0d6a Mon Sep 17 00:00:00 2001
From 19c255144560ce388e919ed5844ec2d4f8ebb267 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 29 Nov 2019 22:37:44 -0600
Subject: [PATCH] Add charged creeper spawn chance
@@ -9,7 +9,7 @@ Subject: [PATCH] Add charged creeper spawn chance
2 files changed, 21 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
index 9bce3f7716..be6a1ea054 100644
index ebae462807..5dd9a57234 100644
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
@@ -1,11 +1,16 @@
@@ -48,7 +48,7 @@ index 9bce3f7716..be6a1ea054 100644
public void b(NBTTagCompound nbttagcompound) {
super.b(nbttagcompound);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 4bf208b35c..b5f12373a9 100644
index 81f41ccc77..544c68b0d8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -208,6 +208,11 @@ public class PurpurConfig {
@@ -60,9 +60,9 @@ index 4bf208b35c..b5f12373a9 100644
+ chargedCreeperChance = getDouble("settings.mobs.creeper.naturally-charged-chance", chargedCreeperChance);
+ }
+
public static boolean enderDragonAlwaysDropsEggBlock = false;
public static boolean enderDragonAlwaysDropsFullExp = false;
private static void enderDragonSettings() {
public static boolean giantsNaturallySpawn = true;
public static boolean giantsHaveAI = true;
private static void giantsSettings() {
--
2.24.0.rc1
2.24.0

12
patches/server/0084-Despawn-egg-hatches-chicken.patch
View File

@@ -1,4 +1,4 @@
From 43b0b6e7711d55097bcedaa9bab727228aeb324b Mon Sep 17 00:00:00 2001
From 7ae71c19d4b9877650e8a0e5d0a7141799758174 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 29 Nov 2019 23:47:42 -0600
Subject: [PATCH] Despawn egg hatches chicken
@@ -41,11 +41,11 @@ index e61af3f5eb..184b2a015a 100644
Vec3D vec3d = this.getMot();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 006dcd225c..63215502e2 100644
index 49472a0531..ed147a9865 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -177,6 +177,13 @@ public class PurpurWorldConfig {
idleTimeoutBroadcastBack = ChatColor.translateAlternateColorCodes('&', getString("idle-timeout.broadcast.back", idleTimeoutBroadcastBack));
elytraDamagePerTridentBoost = getInt("elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
}
+ public int chickenEggsHatchWhenDespawnedMax = 0;
@@ -55,9 +55,9 @@ index 006dcd225c..63215502e2 100644
+ chickenEggsHatchWhenDespawnedRange = getInt("mobs.chicken.eggs-hatch-when-despawned.range", chickenEggsHatchWhenDespawnedRange);
+ }
+
public int pillagerLimitOutpostSpawns = 10;
private void pillagerSettings() {
pillagerLimitOutpostSpawns = getInt("mobs.pillager.limit-outpost-spawns", pillagerLimitOutpostSpawns);
public boolean enderDragonAlwaysDropsEggBlock = false;
public boolean enderDragonAlwaysDropsFullExp = false;
private void enderDragonSettings() {
--
2.24.0

6
patches/server/0085-Option-for-hay-block-fall-damage.patch
View File

@@ -1,4 +1,4 @@
From e9b244c959e8ee034c4206171665907903355099 Mon Sep 17 00:00:00 2001
From 9cdc0cd0fc7a589620fe67e0227de5888adba0bf Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 30 Nov 2019 01:31:09 -0600
Subject: [PATCH] Option for hay block fall damage
@@ -21,10 +21,10 @@ index ca81c49f0a..ca8f957989 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index fc7238886a..31f9b86d5a 100644
index ed147a9865..04b6723322 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -144,6 +144,11 @@ public class PurpurWorldConfig {
@@ -159,6 +159,11 @@ public class PurpurWorldConfig {
milkCuresBadOmen = getBoolean("milk-cures-bad-omen", milkCuresBadOmen);
}

22
patches/server/0086-Add-sleep-options.patch
View File

@@ -1,4 +1,4 @@
From ce25ea0e468fcae7a6ca9bbae69b59ff67d15877 Mon Sep 17 00:00:00 2001
From a390a1f62e35af6c5f9a78ec938aa7e609cc196e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 30 Nov 2019 03:30:17 -0600
Subject: [PATCH] Add sleep options
@@ -9,7 +9,7 @@ Subject: [PATCH] Add sleep options
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 3c9f180960..3957daf751 100644
index 3c9f180960..e1301d3170 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -14,6 +14,11 @@ import java.util.OptionalInt;
@@ -40,10 +40,10 @@ index 3c9f180960..3957daf751 100644
+ private ScriptEngine scriptEngine = new ScriptEngineManager().getEngineByName("JavaScript");
+
+ private boolean unableToSleepRightNow() {
+ if (world.purpurConfig.sleepOnlyWithCondition) {
+ if (world.purpurConfig.playerSleepOnlyWithCondition) {
+ try {
+ scriptEngine.eval("time = " + world.getDayTime());
+ return !(Boolean) scriptEngine.eval(world.purpurConfig.sleepCondition);
+ return !(Boolean) scriptEngine.eval(world.purpurConfig.playerSleepCondition);
+ } catch (ScriptException ignore) {
+ }
+ }
@@ -73,18 +73,18 @@ index 3c9f180960..3957daf751 100644
return Either.left(EntityHuman.EnumBedResult.NOT_POSSIBLE_NOW);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4cfdd5c81c..0b01e5c7cd 100644
index 04b6723322..bb95f4322c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -182,6 +182,13 @@ public class PurpurWorldConfig {
idleTimeoutBroadcastBack = ChatColor.translateAlternateColorCodes('&', getString("idle-timeout.broadcast.back", idleTimeoutBroadcastBack));
elytraDamagePerTridentBoost = getInt("elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
}
+ public boolean sleepOnlyWithCondition = false;
+ public String sleepCondition = "time >= 12541 && time <= 23458";
+ private void sleepSettings() {
+ sleepOnlyWithCondition = getBoolean("sleep.only-with-condition", sleepOnlyWithCondition);
+ sleepCondition = getString("sleep.condition", sleepCondition);
+ public boolean playerSleepOnlyWithCondition = false;
+ public String playerSleepCondition = "time >= 12541 && time <= 23458";
+ private void playerSettings() {
+ playerSleepOnlyWithCondition = getBoolean("player.sleep.only-with-condition", playerSleepOnlyWithCondition);
+ playerSleepCondition = getString("player.sleep.condition", playerSleepCondition);
+ }
+
public int chickenEggsHatchWhenDespawnedMax = 0;

14
patches/server/0089-Add-option-for-zombie-villager-transformation-chance.patch
View File

@@ -1,4 +1,4 @@
From 6fbed3245a52188efd7c7affccb2fc8ba67dab9b Mon Sep 17 00:00:00 2001
From d7e80122731f8bc54201f1b770c9bb5ddd4b79b9 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 19 Dec 2019 16:59:46 -0600
Subject: [PATCH] Add option for zombie villager transformation chance
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option for zombie villager transformation chance
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index 47248cc45e..5703e9e70c 100644
index e9da244d98..0f0df08fff 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -457,8 +457,19 @@ public class EntityZombie extends EntityMonster {
@@ -35,18 +35,18 @@ index 47248cc45e..5703e9e70c 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0b01e5c7cd..17fe278a33 100644
index bb95f4322c..656349339c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -207,4 +207,13 @@ public class PurpurWorldConfig {
villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
@@ -234,4 +234,13 @@ public class PurpurWorldConfig {
private void zombieHorseSettings() {
zombieHorseSpawnChance = (float) getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
}
+
+ public double zombieVillagerTransformationChanceEasy = 0.0D;
+ public double zombieVillagerTransformationChanceNormal = 0.5D;
+ public double zombieVillagerTransformationChanceHard = 1.0D;
+ private void zombieSettings() {
+ private void zombieVillagerSettings() {
+ zombieVillagerTransformationChanceEasy = getDouble("mobs.zombie-villager.transformation-chance.easy", zombieVillagerTransformationChanceEasy);
+ zombieVillagerTransformationChanceNormal = getDouble("mobs.zombie-villager.transformation-chance.normal", zombieVillagerTransformationChanceNormal);
+ zombieVillagerTransformationChanceHard = getDouble("mobs.zombie-villager.transformation-chance.hard", zombieVillagerTransformationChanceHard);

6
patches/server/0090-Add-natural-cat-spawning-options.patch
View File

@@ -1,4 +1,4 @@
From 5b069fb531f188e9fbdf32c49a8836169d78d8f0 Mon Sep 17 00:00:00 2001
From 8963738c69994006d9a94c00d5e2c56a19cb997d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Dec 2019 18:52:55 -0600
Subject: [PATCH] Add natural cat spawning options
@@ -54,11 +54,11 @@ index 6024478dc0..034b973365 100644
return list.size() < 1 ? this.a(blockposition, world) : 0;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 17fe278a33..060eac7121 100644
index 656349339c..58dfc60ca7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -189,6 +189,15 @@ public class PurpurWorldConfig {
sleepCondition = getString("sleep.condition", sleepCondition);
playerSleepCondition = getString("player.sleep.condition", playerSleepCondition);
}
+ public int catSpawnDelay = 1200;

24
patches/server/0091-Add-player-death-exp-control-options.patch
View File

@@ -1,15 +1,15 @@
From 78814b9dd98e6a67af2e12a03e4934545c92c071 Mon Sep 17 00:00:00 2001
From 69b14455429313df707039cdabc19c10488d4c49 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Dec 2019 22:08:37 -0600
Subject: [PATCH] Add player death exp control options
---
.../java/net/minecraft/server/EntityHuman.java | 15 ++++++++++++---
.../java/net/pl3x/purpur/PurpurWorldConfig.java | 7 +++++++
2 files changed, 19 insertions(+), 3 deletions(-)
.../java/net/pl3x/purpur/PurpurWorldConfig.java | 4 ++++
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 3957daf751..15e342454c 100644
index e1301d3170..36ee2cdcce 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1858,9 +1858,18 @@ public abstract class EntityHuman extends EntityLiving {
@@ -35,23 +35,23 @@ index 3957daf751..15e342454c 100644
return 0;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 060eac7121..8bde402422 100644
index 58dfc60ca7..bc8b17ab25 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -167,6 +167,13 @@ public class PurpurWorldConfig {
@@ -182,9 +182,13 @@ public class PurpurWorldConfig {
elytraDamagePerTridentBoost = getInt("elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
}
+ public String playerDeathExpDropEquation = "expLevel * 7";
+ public int playerDeathExpDropMax = 100;
+ private void playerSettings() {
public boolean playerSleepOnlyWithCondition = false;
public String playerSleepCondition = "time >= 12541 && time <= 23458";
private void playerSettings() {
+ playerDeathExpDropEquation = getString("player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
+ playerDeathExpDropMax = getInt("player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
+ }
+
public boolean idleTimeoutKick = true;
public boolean idleTimeoutTickNearbyEntities = false;
public boolean idleTimeoutCountAsSleeping = false;
playerSleepOnlyWithCondition = getBoolean("player.sleep.only-with-condition", playerSleepOnlyWithCondition);
playerSleepCondition = getString("player.sleep.condition", playerSleepCondition);
}
--
2.24.0

17
patches/server/0095-Make-lava-flow-speed-configurable.patch
View File

@@ -1,4 +1,4 @@
From 2919990cd68d4e56d4d4f888e12c908fba2f39f2 Mon Sep 17 00:00:00 2001
From 66648a810a82cd772e71553dc60eeef514770c50 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 2 Jan 2020 11:31:36 -0600
Subject: [PATCH] Make lava flow speed configurable
@@ -6,8 +6,8 @@ Subject: [PATCH] Make lava flow speed configurable
---
src/main/java/net/minecraft/server/FluidTypeLava.java | 5 ++++-
src/main/java/net/minecraft/server/WorldProvider.java | 1 +
src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 4 ++++
3 files changed, 9 insertions(+), 1 deletion(-)
src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 6 +++++-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java
index 09f82c2d92..360470142a 100644
@@ -38,19 +38,20 @@ index 39252e6873..75f8441ab6 100644
return this.d;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8bde402422..57fbb298d3 100644
index bc8b17ab25..118ed99007 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -150,8 +150,12 @@ public class PurpurWorldConfig {
@@ -165,8 +165,12 @@ public class PurpurWorldConfig {
}
public boolean lavaInfinite = false;
+ public int lavaSpeedNether = 10;
+ public int lavaSpeedNotNether = 30;
private void lavaSettings() {
lavaInfinite = getBoolean("settings.lava-flow.infinite", lavaInfinite);
+ lavaSpeedNether = getInt("settings.lava-flow.speed.nether", lavaSpeedNether);
+ lavaSpeedNotNether = getInt("settings.lava-flow.speed.not-nether", lavaSpeedNotNether);
- lavaInfinite = getBoolean("settings.lava-flow.infinite", lavaInfinite);
+ lavaInfinite = getBoolean("lava-flow.infinite", lavaInfinite);
+ lavaSpeedNether = getInt("lava-flow.speed.nether", lavaSpeedNether);
+ lavaSpeedNotNether = getInt("lava-flow.speed.not-nether", lavaSpeedNotNether);
}
public int elytraDamagePerSecond = 1;

6
patches/server/0096-Allow-beehives-to-generate-with-saplings.patch
View File

@@ -1,4 +1,4 @@
From 14fc70da2db7f629b523dac319b2d42a009d48b0 Mon Sep 17 00:00:00 2001
From 1050e92dd278f108e6c5cfeddf64c5c9961e0750 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 4 Jan 2020 11:41:38 -0600
Subject: [PATCH] Allow beehives to generate with saplings
@@ -212,10 +212,10 @@ index 1998d19776..b9264c84c9 100644
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 57fbb298d3..340697ae53 100644
index 118ed99007..d2918411c0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -144,6 +144,11 @@ public class PurpurWorldConfig {
@@ -159,6 +159,11 @@ public class PurpurWorldConfig {
milkCuresBadOmen = getBoolean("milk-cures-bad-omen", milkCuresBadOmen);
}

6
patches/server/0097-Add-configurable-beehive-generation-chance.patch
View File

@@ -1,4 +1,4 @@
From f6ad73931538ad5b6372b2f9093b6e296495bbd8 Mon Sep 17 00:00:00 2001
From 710368d4c617cb81fcb8e0cb0a29dd3318671f5a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 5 Jan 2020 12:07:28 -0600
Subject: [PATCH] Add configurable beehive generation chance
@@ -53,10 +53,10 @@ index e85e096cd6..ca4b5b77fb 100644
// Purpur end
EnumDirection enumdirection = BlockBeehive.a[random.nextInt(BlockBeehive.a.length)];
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 340697ae53..64e00258ac 100644
index d2918411c0..763132a918 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -145,8 +145,20 @@ public class PurpurWorldConfig {
@@ -160,8 +160,20 @@ public class PurpurWorldConfig {
}
public boolean beeHivesGenerateFromSaplings = false;