From b657ae745659c20f335929835ced3d9b5d3d06d1 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 5 Aug 2014 18:45:22 -0500 Subject: [PATCH] Cleanup our patches --- .../0002-PaperSpigot-config-files.patch | 18 +++-- ...low-undead-horse-types-to-be-leashed.patch | 25 ++----- ...0007-Configurable-squid-spawn-ranges.patch | 29 +++----- ...e-damage-multiplier-for-PvP-blocking.patch | 28 +++---- ...ctus-and-reed-natural-growth-heights.patch | 46 ++++-------- ...figurable-baby-zombie-movement-speed.patch | 35 ++++----- ...12-Inverted-Daylight-Detector-Toggle.patch | 43 +++++------ ...0014-Ability-to-disable-asynccatcher.patch | 27 +++---- ...019-Configurable-fishing-time-ranges.patch | 36 ++++----- ...1-Toggle-for-player-interact-limiter.patch | 29 +++----- .../0022-Player-Exhaustion-Multipliers.patch | 73 +++++++------------ ...-despawn-distances-for-living-entiti.patch | 10 +-- ...ck-entities-that-are-above-the-speci.patch | 30 +++----- ...le-speed-for-water-flowing-over-lava.patch | 10 +-- 14 files changed, 176 insertions(+), 263 deletions(-) diff --git a/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch b/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch index f03f5b6c38..09f70f919c 100644 --- a/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch +++ b/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch @@ -1,4 +1,4 @@ -From a8a8c99fdee711e36d49f9c9d1ad5e3816903439 Mon Sep 17 00:00:00 2001 +From 4580551f3e716c0f35e3667c6a1634c0994b3cf3 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 12 Jul 2014 19:32:01 -0500 Subject: [PATCH] PaperSpigot config files @@ -20,7 +20,7 @@ index 9cc0526..e9a1a67 100644 i.info("Generating keypair"); this.a(MinecraftEncryption.b()); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 3dba573..b7509c4 100644 +index 6100297..744d942 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -197,6 +197,7 @@ public abstract class World implements IBlockAccess { @@ -40,7 +40,7 @@ index 3dba573..b7509c4 100644 this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 79d4d99..b6de6e9 100644 +index 2c3a140..93f2726 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -813,6 +813,7 @@ public final class CraftServer implements Server { @@ -68,10 +68,10 @@ index 79d4d99..b6de6e9 100644 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java new file mode 100644 -index 0000000..e296da2 +index 0000000..7ea1617 --- /dev/null +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -@@ -0,0 +1,134 @@ +@@ -0,0 +1,140 @@ +package org.github.paperspigot; + +import com.google.common.base.Throwables; @@ -182,7 +182,13 @@ index 0000000..e296da2 + return config.getBoolean( path, config.getBoolean( path ) ); + } + -+ private static float getFloat(String path, int def) ++ private static double getDouble(String path, double def) ++ { ++ config.addDefault( path, def ); ++ return config.getDouble( path, config.getDouble( path ) ); ++ } ++ ++ private static float getFloat(String path, float def) + { + config.addDefault( path, def ); + return config.getFloat( path, config.getFloat( path ) ); diff --git a/Spigot-Server-Patches/0004-Allow-undead-horse-types-to-be-leashed.patch b/Spigot-Server-Patches/0004-Allow-undead-horse-types-to-be-leashed.patch index 47b606160f..27239956f2 100644 --- a/Spigot-Server-Patches/0004-Allow-undead-horse-types-to-be-leashed.patch +++ b/Spigot-Server-Patches/0004-Allow-undead-horse-types-to-be-leashed.patch @@ -1,29 +1,20 @@ -From d5ec5c8c5934108fe0ba76de561d704450d2b6dc Mon Sep 17 00:00:00 2001 +From b802cfc9eb7d1f6ec5fe1d52e2e460f53bfcb5be Mon Sep 17 00:00:00 2001 From: Zach Brown -Date: Sat, 12 Jul 2014 19:36:18 -0500 +Date: Tue, 5 Aug 2014 16:10:44 -0500 Subject: [PATCH] Allow undead horse types to be leashed diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java -index e9f6236..5b17bcb 100644 +index e9f6236..ec43573 100644 --- a/src/main/java/net/minecraft/server/EntityHorse.java +++ b/src/main/java/net/minecraft/server/EntityHorse.java -@@ -5,6 +5,8 @@ import java.util.List; - - import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; // CraftBukkit - -+import org.github.paperspigot.PaperSpigotWorldConfig; // PaperSpigot -+ - public class EntityHorse extends EntityAnimal implements IInventoryListener { - - private static final IEntitySelector bu = new EntitySelectorHorse(); -@@ -169,7 +171,13 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener { +@@ -169,7 +169,13 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener { } public boolean bM() { - return !this.cE() && super.bM(); -+ // PaperSpigot start - configurable undead horse leashing -+ if (PaperSpigotWorldConfig.allowUndeadHorseLeashing) { ++ // PaperSpigot start - Configurable undead horse leashing ++ if (this.world.paperSpigotConfig.allowUndeadHorseLeashing) { + return super.bM(); + } else { + return !this.cE() && super.bM(); @@ -33,7 +24,7 @@ index e9f6236..5b17bcb 100644 protected void o(float f) { diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index f3bc3aa..1eb5e47 100644 +index f3bc3aa..b9d1afe 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java @@ -74,4 +74,11 @@ public class PaperSpigotWorldConfig @@ -41,7 +32,7 @@ index f3bc3aa..1eb5e47 100644 return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) ); } + -+ public static boolean allowUndeadHorseLeashing; ++ public boolean allowUndeadHorseLeashing; + private void allowUndeadHorseLeashing() + { + allowUndeadHorseLeashing = getBoolean( "allow-undead-horse-leashing", true ); diff --git a/Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch b/Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch index 5cb8ad949e..b05342a585 100644 --- a/Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch +++ b/Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch @@ -1,45 +1,38 @@ -From 6c1fb82fc1e33cae85db1d30ae31dffbc0e26636 Mon Sep 17 00:00:00 2001 +From 2eaa0b4e142f591ab7c320f0ff3a96c4f406cd38 Mon Sep 17 00:00:00 2001 From: Zach Brown -Date: Mon, 19 May 2014 19:30:58 -0500 +Date: Tue, 5 Aug 2014 16:17:15 -0500 Subject: [PATCH] Configurable squid spawn ranges diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index 6e6d612..da6b3a2 100644 +index 6e6d612..bf95300 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java -@@ -2,6 +2,8 @@ package net.minecraft.server; - - import org.bukkit.craftbukkit.TrigMath; // CraftBukkit - -+import org.github.paperspigot.PaperSpigotWorldConfig; // PaperSpigot -+ - public class EntitySquid extends EntityWaterAnimal { - - public float bp; -@@ -146,6 +148,6 @@ public class EntitySquid extends EntityWaterAnimal { +@@ -146,6 +146,7 @@ public class EntitySquid extends EntityWaterAnimal { } public boolean canSpawn() { - return this.locY > 45.0D && this.locY < 63.0D && super.canSpawn(); -+ return this.locY > PaperSpigotWorldConfig.squidMinSpawnHeight && this.locY < PaperSpigotWorldConfig.squidMaxSpawnHeight && super.canSpawn(); // PaperSpigot - Configurable squid spawn height range ++ // PaperSpigot - Configurable squid spawn height range ++ return this.locY > this.world.paperSpigotConfig.squidMinSpawnHeight && this.locY < this.world.paperSpigotConfig.squidMaxSpawnHeight && super.canSpawn(); } } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 1eb5e47..dc8c581 100644 +index b9d1afe..f6b0349 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -81,4 +81,12 @@ public class PaperSpigotWorldConfig +@@ -81,4 +81,13 @@ public class PaperSpigotWorldConfig allowUndeadHorseLeashing = getBoolean( "allow-undead-horse-leashing", true ); log( "Allow undead horse types to be leashed: " + allowUndeadHorseLeashing ); } + -+ public static double squidMinSpawnHeight; -+ public static double squidMaxSpawnHeight; ++ public double squidMinSpawnHeight; ++ public double squidMaxSpawnHeight; + private void squidSpawnHeight() + { + squidMinSpawnHeight = getDouble( "squid-spawn-height.minimum", 45.0D ); + squidMaxSpawnHeight = getDouble( "squid-spawn-height.maximum", 63.0D ); ++ log( "Squids will spawn between Y: " + squidMinSpawnHeight + " and Y: " + squidMaxSpawnHeight); + } } -- diff --git a/Spigot-Server-Patches/0008-Configurable-damage-multiplier-for-PvP-blocking.patch b/Spigot-Server-Patches/0008-Configurable-damage-multiplier-for-PvP-blocking.patch index 8accf64766..c655bf8d06 100644 --- a/Spigot-Server-Patches/0008-Configurable-damage-multiplier-for-PvP-blocking.patch +++ b/Spigot-Server-Patches/0008-Configurable-damage-multiplier-for-PvP-blocking.patch @@ -1,44 +1,36 @@ -From 23836a86f4f24c86c337052597966f7801cc12ee Mon Sep 17 00:00:00 2001 +From f1e2e7c6fc2053e68ea7903d20fef3e6ab342e68 Mon Sep 17 00:00:00 2001 From: Zach Brown -Date: Tue, 24 Jun 2014 07:39:37 -0500 +Date: Tue, 5 Aug 2014 16:21:03 -0500 Subject: [PATCH] Configurable damage multiplier for PvP blocking diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index f3e4328..331d3e1 100644 +index f3e4328..c0355bc 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -20,6 +20,8 @@ import org.bukkit.event.player.PlayerDropItemEvent; - import org.bukkit.event.player.PlayerItemConsumeEvent; - // CraftBukkit end - -+import org.github.paperspigot.PaperSpigotWorldConfig; // PaperSpigot -+ - public abstract class EntityHuman extends EntityLiving implements ICommandListener { - - public PlayerInventory inventory = new PlayerInventory(this); -@@ -824,7 +826,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen +@@ -824,7 +824,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen // CraftBukkit end if (!this.isInvulnerable()) { if (!damagesource.ignoresArmor() && this.isBlocking() && f > 0.0F) { - f = (1.0F + f) * 0.5F; -+ f = (1.0F + f) * PaperSpigotWorldConfig.playerBlockingDamageMultiplier; // PaperSpigot - Configurable PvP blocking damage multiplier ++ f = (1.0F + f) * this.world.paperSpigotConfig.playerBlockingDamageMultiplier; // PaperSpigot - Configurable damage multiplier for blocking } f = this.applyArmorModifier(damagesource, f); diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index dc8c581..9f2c3dc 100644 +index f6b0349..5cda463 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -89,4 +89,10 @@ public class PaperSpigotWorldConfig - squidMinSpawnHeight = getDouble( "squid-spawn-height.minimum", 45.0D ); +@@ -90,4 +90,11 @@ public class PaperSpigotWorldConfig squidMaxSpawnHeight = getDouble( "squid-spawn-height.maximum", 63.0D ); + log( "Squids will spawn between Y: " + squidMinSpawnHeight + " and Y: " + squidMaxSpawnHeight); } + -+ public static float playerBlockingDamageMultiplier; ++ public float playerBlockingDamageMultiplier; + private void playerBlockingDamageMultiplier() + { + playerBlockingDamageMultiplier = getFloat( "player-blocking-damage-multiplier", 0.5F ); ++ log( "Player blocking damage multiplier set to " + playerBlockingDamageMultiplier); + } } -- diff --git a/Spigot-Server-Patches/0009-Configurable-cactus-and-reed-natural-growth-heights.patch b/Spigot-Server-Patches/0009-Configurable-cactus-and-reed-natural-growth-heights.patch index ac42bf431f..24d4fd9a67 100644 --- a/Spigot-Server-Patches/0009-Configurable-cactus-and-reed-natural-growth-heights.patch +++ b/Spigot-Server-Patches/0009-Configurable-cactus-and-reed-natural-growth-heights.patch @@ -1,67 +1,51 @@ -From 9990656f0898c13e7cb844b1d16ab3ca38122c8d Mon Sep 17 00:00:00 2001 +From ca1ba942144325966ed83e1efb00be333659b135 Mon Sep 17 00:00:00 2001 From: Zach Brown -Date: Tue, 24 Jun 2014 07:44:59 -0500 +Date: Tue, 5 Aug 2014 16:26:30 -0500 Subject: [PATCH] Configurable cactus and reed natural growth heights diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java -index f55e531..cc16f1d 100644 +index f55e531..e2e41b9 100644 --- a/src/main/java/net/minecraft/server/BlockCactus.java +++ b/src/main/java/net/minecraft/server/BlockCactus.java -@@ -4,6 +4,8 @@ import java.util.Random; - - import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit - -+import org.github.paperspigot.PaperSpigotWorldConfig; // PaperSpigot -+ - public class BlockCactus extends Block { - - protected BlockCactus() { -@@ -20,7 +22,7 @@ public class BlockCactus extends Block { +@@ -20,7 +20,7 @@ public class BlockCactus extends Block { ; } - if (l < 3) { -+ if (l < PaperSpigotWorldConfig.cactusMaxHeight) { // PaperSpigot - Configurable natural growth heights ++ if (l < world.paperSpigotConfig.cactusMaxHeight) { // PaperSpigot - Configurable max growth height for cactus blocks int i1 = world.getData(i, j, k); if (i1 >= (byte) range(3, (world.growthOdds / world.spigotConfig.cactusModifier * 15) + 0.5F, 15)) { // Spigot diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java -index 6c04ad2..9d638fe 100644 +index 6c04ad2..0fa3349 100644 --- a/src/main/java/net/minecraft/server/BlockReed.java +++ b/src/main/java/net/minecraft/server/BlockReed.java -@@ -1,5 +1,7 @@ - package net.minecraft.server; - -+import org.github.paperspigot.PaperSpigotWorldConfig; // PaperSpigot -+ - import java.util.Random; - - public class BlockReed extends Block { -@@ -21,7 +23,7 @@ public class BlockReed extends Block { +@@ -21,7 +21,7 @@ public class BlockReed extends Block { ; } - if (l < 3) { -+ if (l < PaperSpigotWorldConfig.reedMaxHeight) { // PaperSpigot - Configurable natural growth heights ++ if (l < world.paperSpigotConfig.reedMaxHeight) { // PaperSpigot - Configurable max growth height for reed blocks int i1 = world.getData(i, j, k); if (i1 >= (byte) range(3, (world.growthOdds / world.spigotConfig.caneModifier * 15) + 0.5F, 15)) { // Spigot diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 9f2c3dc..27be0a8 100644 +index 5cda463..0878ea7 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -95,4 +95,12 @@ public class PaperSpigotWorldConfig - { +@@ -97,4 +97,13 @@ public class PaperSpigotWorldConfig playerBlockingDamageMultiplier = getFloat( "player-blocking-damage-multiplier", 0.5F ); + log( "Player blocking damage multiplier set to " + playerBlockingDamageMultiplier); } + -+ public static int cactusMaxHeight; -+ public static int reedMaxHeight; ++ public int cactusMaxHeight; ++ public int reedMaxHeight; + private void blockGrowthHeight() + { + cactusMaxHeight = getInt( "max-growth-height.cactus", 3 ); -+ reedMaxHeight = getInt ( "max-growth-height.reeds", 3 ); ++ reedMaxHeight = getInt( "max-growth-height.reeds", 3 ); ++ log( "Max height for cactus growth " + cactusMaxHeight + ". Max height for reed growth " + reedMaxHeight); + } } -- diff --git a/Spigot-Server-Patches/0010-Configurable-baby-zombie-movement-speed.patch b/Spigot-Server-Patches/0010-Configurable-baby-zombie-movement-speed.patch index 45099ed8dc..feed2aa730 100644 --- a/Spigot-Server-Patches/0010-Configurable-baby-zombie-movement-speed.patch +++ b/Spigot-Server-Patches/0010-Configurable-baby-zombie-movement-speed.patch @@ -1,41 +1,36 @@ -From ef49848716a837e9d6f7bf25cf00cc74e37a57f5 Mon Sep 17 00:00:00 2001 +From 0b2f0d7f6919abe5727ca0e0e52301664183e237 Mon Sep 17 00:00:00 2001 From: Zach Brown -Date: Wed, 21 May 2014 15:35:12 -0500 +Date: Tue, 5 Aug 2014 17:18:23 -0500 Subject: [PATCH] Configurable baby zombie movement speed diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index f732579..d83cceb 100644 +index f732579..41e59ba 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java -@@ -13,11 +13,13 @@ import org.bukkit.event.entity.EntityCombustEvent; - import org.bukkit.event.entity.EntityTargetEvent; - //CraftBukkit end - -+import org.github.paperspigot.PaperSpigotWorldConfig; // PaperSpigot -+ - public class EntityZombie extends EntityMonster { +@@ -17,7 +17,8 @@ public class EntityZombie extends EntityMonster { protected static final IAttribute bp = (new AttributeRanged("zombie.spawnReinforcements", 0.0D, 0.0D, 1.0D)).a("Spawn Reinforcements Chance"); private static final UUID bq = UUID.fromString("B9766B59-9566-4402-BC1F-2EE2A276D836"); - private static final AttributeModifier br = new AttributeModifier(bq, "Baby speed boost", 0.5D, 1); -+ private static final AttributeModifier br = new AttributeModifier(bq, "Baby speed boost", PaperSpigotWorldConfig.babyZombieMovementSpeed, 1); // PaperSpigot - Make baby zombie movement speed configurable ++ // PaperSpigot - Configurable baby zombie movement speed ++ private static final AttributeModifier br = new AttributeModifier(bq, "Baby speed boost", org.github.paperspigot.PaperSpigotConfig.babyZombieMovementSpeed, 1); private final PathfinderGoalBreakDoor bs = new PathfinderGoalBreakDoor(this); private int bt; private boolean bu = false; -diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 27be0a8..29863cd 100644 ---- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -103,4 +103,10 @@ public class PaperSpigotWorldConfig - cactusMaxHeight = getInt( "max-growth-height.cactus", 3 ); - reedMaxHeight = getInt ( "max-growth-height.reeds", 3 ); +diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java +index 7ea1617..f4acbb3 100644 +--- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java ++++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java +@@ -137,4 +137,10 @@ public class PaperSpigotConfig + config.addDefault( path, def ); + return config.getString( path, config.getString( path ) ); } + + public static double babyZombieMovementSpeed; -+ private void babyZombieMovementSpeed() ++ private static void babyZombieMovementSpeed() + { -+ babyZombieMovementSpeed = getDouble( "baby-zombie-movement-speed", 0.5D ); ++ babyZombieMovementSpeed = getDouble( "settings.baby-zombie-movement-speed", 0.5D); // Player moves at 0.1F, for reference + } } -- diff --git a/Spigot-Server-Patches/0012-Inverted-Daylight-Detector-Toggle.patch b/Spigot-Server-Patches/0012-Inverted-Daylight-Detector-Toggle.patch index 8e8b8ef644..5e1efecab8 100644 --- a/Spigot-Server-Patches/0012-Inverted-Daylight-Detector-Toggle.patch +++ b/Spigot-Server-Patches/0012-Inverted-Daylight-Detector-Toggle.patch @@ -1,22 +1,14 @@ -From 4c099f1b1105f8fbdcbf7cf360a304b00ca2b139 Mon Sep 17 00:00:00 2001 +From 4d27753cb0ac3a0478d4ed812756ebea206810ca Mon Sep 17 00:00:00 2001 From: gsand -Date: Sun, 6 Jul 2014 02:46:20 -0500 +Date: Tue, 5 Aug 2014 17:31:07 -0500 Subject: [PATCH] Inverted Daylight Detector Toggle diff --git a/src/main/java/net/minecraft/server/BlockDaylightDetector.java b/src/main/java/net/minecraft/server/BlockDaylightDetector.java -index 96e9c37..dc84635 100644 +index 96e9c37..1298610 100644 --- a/src/main/java/net/minecraft/server/BlockDaylightDetector.java +++ b/src/main/java/net/minecraft/server/BlockDaylightDetector.java -@@ -1,5 +1,7 @@ - package net.minecraft.server; - -+import org.github.paperspigot.PaperSpigotWorldConfig; // PaperSpigot -+ - import java.util.Random; - - public class BlockDaylightDetector extends BlockContainer { -@@ -38,14 +40,27 @@ public class BlockDaylightDetector extends BlockContainer { +@@ -38,14 +38,27 @@ public class BlockDaylightDetector extends BlockContainer { f += (6.2831855F - f) * 0.2F; } @@ -24,15 +16,16 @@ index 96e9c37..dc84635 100644 - if (i1 < 0) { - i1 = 0; - } -+ // PaperSpigot start - Inverted Daylight Detectors -+ if (PaperSpigotWorldConfig.InvertedDaylightDetectors) { +- +- if (i1 > 15) { +- i1 = 15; ++ // PaperSpigot start - Configurable "inversion" for daylight detectors ++ if (world.paperSpigotConfig.invertedDaylightDetectors) { + i1 = Math.round((float) i1 * MathHelper.cos(f) * -1 + 15); + if (i1 < 10) { + i1 = 0; + } - -- if (i1 > 15) { -- i1 = 15; ++ + if (i1 > 9) { + i1 = 15; + } @@ -51,19 +44,19 @@ index 96e9c37..dc84635 100644 if (l != i1) { i1 = org.bukkit.craftbukkit.event.CraftEventFactory.callRedstoneChange(world, i, j, k, l, i1).getNewCurrent(); // CraftBukkit - Call BlockRedstoneEvent diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 29863cd..c219cab 100644 +index 0878ea7..9cd9c6d 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -109,4 +109,11 @@ public class PaperSpigotWorldConfig - { - babyZombieMovementSpeed = getDouble( "baby-zombie-movement-speed", 0.5D ); +@@ -106,4 +106,11 @@ public class PaperSpigotWorldConfig + reedMaxHeight = getInt( "max-growth-height.reeds", 3 ); + log( "Max height for cactus growth " + cactusMaxHeight + ". Max height for reed growth " + reedMaxHeight); } + -+ public static boolean InvertedDaylightDetectors; -+ private void InvertedDaylightDetectors() ++ public boolean invertedDaylightDetectors; ++ private void invertedDaylightDetectors() + { -+ InvertedDaylightDetectors = getBoolean( "inverted-daylight-detectors", false ); -+ log( "Inverted Redstone Lamps: " + InvertedDaylightDetectors ); ++ invertedDaylightDetectors = getBoolean( "inverted-daylight-detectors", false ); ++ log( "Inverted Redstone Lamps: " + invertedDaylightDetectors ); + } } -- diff --git a/Spigot-Server-Patches/0014-Ability-to-disable-asynccatcher.patch b/Spigot-Server-Patches/0014-Ability-to-disable-asynccatcher.patch index 0015e02823..c442becfff 100644 --- a/Spigot-Server-Patches/0014-Ability-to-disable-asynccatcher.patch +++ b/Spigot-Server-Patches/0014-Ability-to-disable-asynccatcher.patch @@ -1,42 +1,37 @@ -From ba45279e3c472cf8a1ac8af1915cff787aa1a7d9 Mon Sep 17 00:00:00 2001 +From 1ef0a28bb134bad8a4cab88ebb2669baad054bf6 Mon Sep 17 00:00:00 2001 From: Zach Brown -Date: Sat, 12 Jul 2014 19:37:16 -0500 +Date: Tue, 5 Aug 2014 17:39:04 -0500 Subject: [PATCH] Ability to disable asynccatcher diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -index e296da2..f7dc787 100644 +index f4acbb3..2cc159b 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -@@ -131,4 +131,13 @@ public class PaperSpigotConfig - config.addDefault( path, def ); - return config.getString( path, config.getString( path ) ); +@@ -143,4 +143,13 @@ public class PaperSpigotConfig + { + babyZombieMovementSpeed = getDouble( "settings.baby-zombie-movement-speed", 0.5D); // Player moves at 0.1F, for reference } + + public static boolean asyncCatcherFeature; + private static void asyncCatcherFeature() + { + asyncCatcherFeature = getBoolean( "settings.async-plugin-bad-magic-catcher", true ); -+ if ( !asyncCatcherFeature ) { -+ Bukkit.getLogger().log( Level.INFO, "Disabling async plugin bad ju-ju catcher, this might be bad depending on your plugins" ); ++ if (!asyncCatcherFeature) { ++ Bukkit.getLogger().log( Level.INFO, "Disabling async plugin bad ju-ju catcher, this may be bad depending on your plugins" ); + } + } } diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java -index 4b3aa85..c4312db 100644 +index 4b3aa85..f7e8d16 100644 --- a/src/main/java/org/spigotmc/AsyncCatcher.java +++ b/src/main/java/org/spigotmc/AsyncCatcher.java -@@ -1,11 +1,12 @@ - package org.spigotmc; - - import net.minecraft.server.MinecraftServer; -+import org.github.paperspigot.PaperSpigotConfig; // PaperSpigot - +@@ -5,7 +5,7 @@ import net.minecraft.server.MinecraftServer; public class AsyncCatcher { - public static boolean enabled = true; -+ public static boolean enabled = PaperSpigotConfig.asyncCatcherFeature; // PaperSpigot - AsyncCatcher override feature ++ public static boolean enabled = org.github.paperspigot.PaperSpigotConfig.asyncCatcherFeature; // PaperSpigot - Allow disabling of AsyncCatcher from PaperSpigotConfig public static void catchOp(String reason) { diff --git a/Spigot-Server-Patches/0019-Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/0019-Configurable-fishing-time-ranges.patch index 1c245da484..182c0e1d82 100644 --- a/Spigot-Server-Patches/0019-Configurable-fishing-time-ranges.patch +++ b/Spigot-Server-Patches/0019-Configurable-fishing-time-ranges.patch @@ -1,46 +1,38 @@ -From db7ac74f4f1a87642f72e9d3afc2c2c2cf7fb6f7 Mon Sep 17 00:00:00 2001 +From 117d035fae9747b3caa7d77448cebb4f1828bb8d Mon Sep 17 00:00:00 2001 From: Zach Brown -Date: Sun, 29 Jun 2014 13:22:09 -0500 +Date: Tue, 5 Aug 2014 17:49:02 -0500 Subject: [PATCH] Configurable fishing time ranges diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 197dca1..3cd7838 100644 +index 197dca1..7d0fda6 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java -@@ -10,6 +10,8 @@ import org.bukkit.entity.Fish; - import org.bukkit.event.player.PlayerFishEvent; - // CraftBukkit end - -+import org.github.paperspigot.PaperSpigotWorldConfig; // PaperSpigot -+ - public class EntityFishingHook extends Entity { - - private static final List d = Arrays.asList(new PossibleFishingResult[] { (new PossibleFishingResult(new ItemStack(Items.LEATHER_BOOTS), 10)).a(0.9F), new PossibleFishingResult(new ItemStack(Items.LEATHER), 10), new PossibleFishingResult(new ItemStack(Items.BONE), 10), new PossibleFishingResult(new ItemStack(Items.POTION), 10), new PossibleFishingResult(new ItemStack(Items.STRING), 5), (new PossibleFishingResult(new ItemStack(Items.FISHING_ROD), 2)).a(0.9F), new PossibleFishingResult(new ItemStack(Items.BOWL), 10), new PossibleFishingResult(new ItemStack(Items.STICK), 5), new PossibleFishingResult(new ItemStack(Items.INK_SACK, 10, 0), 1), new PossibleFishingResult(new ItemStack(Blocks.TRIPWIRE_SOURCE), 10), new PossibleFishingResult(new ItemStack(Items.ROTTEN_FLESH), 10)}); -@@ -315,7 +317,7 @@ public class EntityFishingHook extends Entity { +@@ -315,7 +315,8 @@ public class EntityFishingHook extends Entity { this.az = MathHelper.nextInt(this.random, 20, 80); } } else { - this.ay = MathHelper.nextInt(this.random, 100, 900); -+ this.ay = MathHelper.nextInt(this.random, PaperSpigotWorldConfig.fishingMinTicks, PaperSpigotWorldConfig.fishingMaxTicks); // PaperSpigot - configurable fishing time range ++ // PaperSpigot - Configurable fishing tick range ++ this.ay = MathHelper.nextInt(this.random, this.world.paperSpigotConfig.fishingMinTicks, this.world.paperSpigotConfig.fishingMaxTicks); this.ay -= EnchantmentManager.getLureEnchantmentLevel(this.owner) * 20 * 5; } } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index c219cab..554e74a 100644 +index 9cd9c6d..1d01f89 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -116,4 +116,12 @@ public class PaperSpigotWorldConfig - InvertedDaylightDetectors = getBoolean( "inverted-daylight-detectors", false ); - log( "Inverted Redstone Lamps: " + InvertedDaylightDetectors ); +@@ -113,4 +113,12 @@ public class PaperSpigotWorldConfig + invertedDaylightDetectors = getBoolean( "inverted-daylight-detectors", false ); + log( "Inverted Redstone Lamps: " + invertedDaylightDetectors ); } + -+ public static int fishingMinTicks = 100; -+ public static int fishingMaxTicks = 900; ++ public int fishingMinTicks; ++ public int fishingMaxTicks; + private void fishingTickRange() + { -+ fishingMinTicks = getInt( "fishing-time-range.MinimumTicks", fishingMinTicks ); -+ fishingMaxTicks = getInt( "fishing-time-range.MaximumTicks", fishingMaxTicks ); ++ fishingMinTicks = getInt( "fishing-time-range.MinimumTicks", 100 ); ++ fishingMaxTicks = getInt( "fishing-time-range.MaximumTicks", 900 ); + } } -- diff --git a/Spigot-Server-Patches/0021-Toggle-for-player-interact-limiter.patch b/Spigot-Server-Patches/0021-Toggle-for-player-interact-limiter.patch index 05f2f7187e..77ef13ea85 100644 --- a/Spigot-Server-Patches/0021-Toggle-for-player-interact-limiter.patch +++ b/Spigot-Server-Patches/0021-Toggle-for-player-interact-limiter.patch @@ -1,37 +1,29 @@ -From 3a2f833cbbc263cd50e7a3cdb01c909cc32a7377 Mon Sep 17 00:00:00 2001 +From 6960ce33320bd8116f780e553b8dcbd3dcdd7c5d Mon Sep 17 00:00:00 2001 From: Zach Brown -Date: Thu, 24 Jul 2014 22:19:44 -0500 +Date: Tue, 5 Aug 2014 17:56:02 -0500 Subject: [PATCH] Toggle for player interact limiter diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 97037ff..43bce01 100644 +index 97037ff..f78824c 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -59,6 +59,8 @@ import org.bukkit.inventory.InventoryView; - import org.bukkit.util.NumberConversions; - // CraftBukkit end - -+import org.github.paperspigot.PaperSpigotConfig; // PaperSpigot -+ - public class PlayerConnection implements PacketPlayInListener { - - private static final Logger c = LogManager.getLogger(); -@@ -581,7 +583,7 @@ public class PlayerConnection implements PacketPlayInListener { +@@ -581,7 +581,8 @@ public class PlayerConnection implements PacketPlayInListener { public void a(PacketPlayInBlockPlace packetplayinblockplace) { boolean throttled = false; - if (lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 30 && packets++ >= 4) { -+ if (PaperSpigotConfig.interactLimitEnabled && lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 30 && packets++ >= 4) { ++ // PaperSpigot - Allow disabling the player interaction limiter ++ if (org.github.paperspigot.PaperSpigotConfig.interactLimitEnabled && lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 30 && packets++ >= 4) { throttled = true; } else if ( packetplayinblockplace.timestamp - lastPlace >= 30 || lastPlace == -1 ) { diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -index f7dc787..ec800c3 100644 +index 2cc159b..25a94a6 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -@@ -140,4 +140,10 @@ public class PaperSpigotConfig - Bukkit.getLogger().log( Level.INFO, "Disabling async plugin bad ju-ju catcher, this might be bad depending on your plugins" ); +@@ -152,4 +152,13 @@ public class PaperSpigotConfig + Bukkit.getLogger().log( Level.INFO, "Disabling async plugin bad ju-ju catcher, this may be bad depending on your plugins" ); } } + @@ -39,6 +31,9 @@ index f7dc787..ec800c3 100644 + private static void interactLimitEnabled() + { + interactLimitEnabled = getBoolean( "settings.limit-player-interactions", true ); ++ if (!interactLimitEnabled) { ++ Bukkit.getLogger().log( Level.INFO, "Disabling player interaction limiter, your server may be more vulnerable to malicious users" ); ++ } + } } -- diff --git a/Spigot-Server-Patches/0022-Player-Exhaustion-Multipliers.patch b/Spigot-Server-Patches/0022-Player-Exhaustion-Multipliers.patch index 127432c90c..bb1e97cb70 100644 --- a/Spigot-Server-Patches/0022-Player-Exhaustion-Multipliers.patch +++ b/Spigot-Server-Patches/0022-Player-Exhaustion-Multipliers.patch @@ -1,112 +1,95 @@ -From 03fd82c592adf649a22887945ddc2b2cb8655e4e Mon Sep 17 00:00:00 2001 +From 9471d677129b9aebaa0045bb39f128ace1769b46 Mon Sep 17 00:00:00 2001 From: gsand -Date: Tue, 8 Jul 2014 21:41:43 -0500 +Date: Tue, 5 Aug 2014 18:28:21 -0500 Subject: [PATCH] Player Exhaustion Multipliers diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 0893a6f..89c2832 100644 +index 0893a6f..acb9c54 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java -@@ -4,6 +4,8 @@ import java.util.Iterator; - import java.util.List; - import java.util.Random; - -+import org.github.paperspigot.PaperSpigotWorldConfig; // PaperSpigot -+ - public class Block { - - public static final RegistryMaterials REGISTRY = new RegistryBlocks("air"); -@@ -686,7 +688,7 @@ public class Block { +@@ -686,7 +686,7 @@ public class Block { public void a(World world, EntityHuman entityhuman, int i, int j, int k, int l) { entityhuman.a(StatisticList.MINE_BLOCK_COUNT[getId(this)], 1); - entityhuman.applyExhaustion(0.025F); -+ entityhuman.a( PaperSpigotWorldConfig.playerExhaustionBlockBreak ); // PaperSpigot - Configurable block breaking exhaustion ++ entityhuman.applyExhaustion(org.github.paperspigot.PaperSpigotConfig.playerExhaustionBlockBreak); // PaperSpigot - Configurable block breaking exhaustion if (this.E() && EnchantmentManager.hasSilkTouchEnchantment(entityhuman)) { ItemStack itemstack = this.j(l); diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 331d3e1..8882a40 100644 +index c0355bc..08987f2 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -1008,7 +1008,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen +@@ -1006,7 +1006,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen } } - this.applyExhaustion(0.3F); -+ this.a( PaperSpigotWorldConfig.playerExhaustionAttack ); // PaperSpigot - Configurable attack exhaustion ++ this.applyExhaustion(org.github.paperspigot.PaperSpigotConfig.playerExhaustionAttack); // PaperSpigot - Configurable attack exhaustion } else if (flag1) { entity.extinguish(); } -@@ -1268,9 +1268,9 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen +@@ -1266,9 +1266,9 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen super.bj(); this.a(StatisticList.r, 1); if (this.isSprinting()) { - this.applyExhaustion(0.8F); -+ this.a( PaperSpigotWorldConfig.playerExhaustionSprintJumping ); // PaperSpigot - Configurable sprint jumping exhaustion ++ this.applyExhaustion(org.github.paperspigot.PaperSpigotConfig.playerExhaustionSprintJumping); // PaperSpigot - Configurable sprint jumping exhaustion } else { - this.applyExhaustion(0.2F); -+ this.a( PaperSpigotWorldConfig.playerExhaustionJumping ); // PaperSpigot - Configurable jumping exhaustion ++ this.applyExhaustion(org.github.paperspigot.PaperSpigotConfig.playerExhaustionJumping); // PaperSpigot - Configurable jumping exhaustion } } -@@ -1306,13 +1306,13 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen +@@ -1304,13 +1304,13 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen i = Math.round(MathHelper.sqrt(d0 * d0 + d1 * d1 + d2 * d2) * 100.0F); if (i > 0) { this.a(StatisticList.m, i); - this.applyExhaustion(0.015F * (float) i * 0.01F); -+ this.a( PaperSpigotWorldConfig.playerExhaustionSwimming * (float) i * 0.01F); // PaperSpigot - Configurable swimming exhaustion ++ this.applyExhaustion(org.github.paperspigot.PaperSpigotConfig.playerExhaustionSwimming * (float) i * 0.01F); // PaperSpigot - Configurable swimming exhaustion } } else if (this.M()) { i = Math.round(MathHelper.sqrt(d0 * d0 + d2 * d2) * 100.0F); if (i > 0) { this.a(StatisticList.i, i); - this.applyExhaustion(0.015F * (float) i * 0.01F); -+ this.a( PaperSpigotWorldConfig.playerExhaustionSwimming * (float) i * 0.01F); // PaperSpigot - Configurable swimming (diving) exhaustion ++ this.applyExhaustion(org.github.paperspigot.PaperSpigotConfig.playerExhaustionSwimming * (float) i * 0.01F); // PaperSpigot - Configurable swimming (diving) exhaustion } } else if (this.h_()) { if (d1 > 0.0D) { -@@ -1323,9 +1323,9 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen +@@ -1321,9 +1321,9 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen if (i > 0) { this.a(StatisticList.h, i); if (this.isSprinting()) { - this.applyExhaustion(0.099999994F * (float) i * 0.01F); -+ this.a( PaperSpigotWorldConfig.playerExhaustionSprinting * (float) i * 0.01F); // PaperSpigot - Configurable sprinting exhaustion ++ this.applyExhaustion(org.github.paperspigot.PaperSpigotConfig.playerExhaustionSprinting * (float) i * 0.01F); // PaperSpigot - Configurable sprinting exhaustion } else { - this.applyExhaustion(0.01F * (float) i * 0.01F); -+ this.a( PaperSpigotWorldConfig.playerExhaustionWalking * (float) i * 0.01F); // PaperSpigot - Configurable walking exhaustion ++ this.applyExhaustion(org.github.paperspigot.PaperSpigotConfig.playerExhaustionWalking * (float) i * 0.01F); // PaperSpigot - Configurable walking exhaustion } } } else { diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java -index 4169231..30f79a1 100644 +index 4169231..0189c99 100644 --- a/src/main/java/net/minecraft/server/FoodMetaData.java +++ b/src/main/java/net/minecraft/server/FoodMetaData.java -@@ -1,5 +1,7 @@ - package net.minecraft.server; - -+import org.github.paperspigot.PaperSpigotWorldConfig; // PaperSpigot -+ - public class FoodMetaData { - - // CraftBukkit start - All made public -@@ -65,7 +67,7 @@ public class FoodMetaData { +@@ -65,7 +65,7 @@ public class FoodMetaData { if (this.foodTickTimer >= 80) { // CraftBukkit - added RegainReason entityhuman.heal(1.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED); - this.a(3.0F); -+ this.a( PaperSpigotWorldConfig.playerExhaustionRegeneration ); // PaperSpigot - Configurable regeneration exhaustion ++ this.a(org.github.paperspigot.PaperSpigotConfig.playerExhaustionRegeneration); // PaperSpigot - Configurable regeneration exhaustion this.foodTickTimer = 0; } } else if (this.foodLevel <= 0) { -diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 554e74a..dec078a 100644 ---- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -124,4 +124,24 @@ public class PaperSpigotWorldConfig - fishingMinTicks = getInt( "fishing-time-range.MinimumTicks", fishingMinTicks ); - fishingMaxTicks = getInt( "fishing-time-range.MaximumTicks", fishingMaxTicks ); +diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java +index 25a94a6..89bb1ca 100644 +--- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java ++++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java +@@ -161,4 +161,24 @@ public class PaperSpigotConfig + Bukkit.getLogger().log( Level.INFO, "Disabling player interaction limiter, your server may be more vulnerable to malicious users" ); + } } + + public static float playerExhaustionWalking; @@ -117,7 +100,7 @@ index 554e74a..dec078a 100644 + public static float playerExhaustionSprintJumping; + public static float playerExhaustionAttack; + public static float playerExhaustionRegeneration; -+ private void playerExhaustion() ++ private static void playerExhaustion() + { + playerExhaustionWalking = getFloat( "player-exhaustion.walking", 0.01F ); + playerExhaustionSwimming = getFloat( "player-exhaustion.swimming", 0.015F ); diff --git a/Spigot-Server-Patches/0023-Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/0023-Add-configurable-despawn-distances-for-living-entiti.patch index aa9cc2c6e0..a3aaf463ce 100644 --- a/Spigot-Server-Patches/0023-Add-configurable-despawn-distances-for-living-entiti.patch +++ b/Spigot-Server-Patches/0023-Add-configurable-despawn-distances-for-living-entiti.patch @@ -1,4 +1,4 @@ -From c2ea4c55f6bacf5d06871b5065063e7a879ba636 Mon Sep 17 00:00:00 2001 +From 4bd854bcda1d3f9666d2a908cc80c63afc3d002a Mon Sep 17 00:00:00 2001 From: Suddenly Date: Mon, 7 Jul 2014 04:11:34 +0100 Subject: [PATCH] Add configurable despawn distances for living entities @@ -26,12 +26,12 @@ index 2915f4a..d0f7033 100644 } } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index dec078a..e627c4e 100644 +index 1d01f89..3d11da5 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -144,4 +144,22 @@ public class PaperSpigotWorldConfig - playerExhaustionAttack = getFloat( "player-exhaustion.attack", 0.3F ); - playerExhaustionRegeneration = getFloat( "player-exhaustion.regeneration", 3.0F ); +@@ -121,4 +121,22 @@ public class PaperSpigotWorldConfig + fishingMinTicks = getInt( "fishing-time-range.MinimumTicks", 100 ); + fishingMaxTicks = getInt( "fishing-time-range.MaximumTicks", 900 ); } + + public Integer softDespawnDistance; diff --git a/Spigot-Server-Patches/0028-Drop-falling-block-entities-that-are-above-the-speci.patch b/Spigot-Server-Patches/0028-Drop-falling-block-entities-that-are-above-the-speci.patch index f26eed4fe2..1e3415e7cf 100644 --- a/Spigot-Server-Patches/0028-Drop-falling-block-entities-that-are-above-the-speci.patch +++ b/Spigot-Server-Patches/0028-Drop-falling-block-entities-that-are-above-the-speci.patch @@ -1,29 +1,20 @@ -From 4e3e279e87216581baf20ca7826b1fb31e8649b1 Mon Sep 17 00:00:00 2001 +From 2c20bd30ddb002e0f17abbce55b0ccf99fb659c2 Mon Sep 17 00:00:00 2001 From: Byteflux -Date: Wed, 30 Jul 2014 03:31:43 -0500 +Date: Tue, 5 Aug 2014 18:39:57 -0500 Subject: [PATCH] Drop falling block entities that are above the specified - height diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index df602bd..5a36e1e 100644 +index df602bd..00dcca6 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java -@@ -4,6 +4,7 @@ import java.util.ArrayList; - import java.util.Iterator; - - import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit -+import org.github.paperspigot.PaperSpigotWorldConfig; - - public class EntityFallingBlock extends Entity { - -@@ -67,6 +68,17 @@ public class EntityFallingBlock extends Entity { +@@ -67,6 +67,17 @@ public class EntityFallingBlock extends Entity { ++this.ticksLived; this.motY -= 0.03999999910593033D; this.move(this.motX, this.motY, this.motZ); + + // PaperSpigot start - Drop falling blocks above the specified height -+ if (PaperSpigotWorldConfig.fallingBlockHeightNerf != 0 && this.locY > PaperSpigotWorldConfig.fallingBlockHeightNerf) { ++ if (this.world.paperSpigotConfig.fallingBlockHeightNerf != 0 && this.locY > this.world.paperSpigotConfig.fallingBlockHeightNerf) { + if (this.dropItem) { + this.a(new ItemStack(this.id, 1, this.id.getDropData(this.data)), 0.0F); + } @@ -36,19 +27,22 @@ index df602bd..5a36e1e 100644 this.motY *= 0.9800000190734863D; this.motZ *= 0.9800000190734863D; diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 39bbd62..5e72313 100644 +index f998cb0..fc9b6df 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -169,4 +169,11 @@ public class PaperSpigotWorldConfig +@@ -146,4 +146,14 @@ public class PaperSpigotWorldConfig keepSpawnInMemory = getBoolean( "keep-spawn-loaded", true ); log( "Keep spawn chunk loaded: " + keepSpawnInMemory ); } + -+ public static double fallingBlockHeightNerf; -+ private void fallingBlockHeightNerf() ++ public double fallingBlockHeightNerf; ++ private void fallingBlockheightNerf() + { + // Technically a little disingenuous as it applies to all falling blocks but alas, backwards compat prevails! + fallingBlockHeightNerf = getDouble( "tnt-entity-height-nerf", 0 ); ++ if (fallingBlockHeightNerf != 0) { ++ log( "TNT/Falling Block Height Limit set to Y: " + fallingBlockHeightNerf); ++ } + } } -- diff --git a/Spigot-Server-Patches/0030-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0030-Configurable-speed-for-water-flowing-over-lava.patch index 7e6a5e0b89..3d48435852 100644 --- a/Spigot-Server-Patches/0030-Configurable-speed-for-water-flowing-over-lava.patch +++ b/Spigot-Server-Patches/0030-Configurable-speed-for-water-flowing-over-lava.patch @@ -1,4 +1,4 @@ -From eb0b830ce23ab89758193eb1c2a9e1ae9ac00df2 Mon Sep 17 00:00:00 2001 +From 0bb791d470c5d4067198a353c2f0aab3168ff20f Mon Sep 17 00:00:00 2001 From: Byteflux Date: Sun, 3 Aug 2014 21:20:42 -0500 Subject: [PATCH] Configurable speed for water flowing over lava @@ -46,12 +46,12 @@ index cdce3ff..6409391 100644 + } } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 5e72313..dccb780 100644 +index fc9b6df..256316e 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -176,4 +176,11 @@ public class PaperSpigotWorldConfig - // Technically a little disingenuous as it applies to all falling blocks but alas, backwards compat prevails! - fallingBlockHeightNerf = getDouble( "tnt-entity-height-nerf", 0 ); +@@ -156,4 +156,11 @@ public class PaperSpigotWorldConfig + log( "TNT/Falling Block Height Limit set to Y: " + fallingBlockHeightNerf); + } } + + public int waterOverLavaFlowSpeed;