From cac7bbc139c6aee98ae385ba81fe02069a85fce6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 27 May 2016 21:35:28 -0400 Subject: [PATCH] Remove unneeded mob spawn cap patch - Fixes #235 I misread the code and thought the code kept looping until the mob spawn cap was hit. Upon furthur review, this is not true, so this patch doesn't do anything sane. --- ...-to-configure-frosted_ice-properties.patch | 8 +-- ...-number-of-attempts-at-spawning-mobs.patch | 50 ------------------- .../Arrow-pickup-rule-API.patch | 4 +- ...blocking-on-Network-Manager-creation.patch | 4 +- ...nt-additions-and-mark-entities-remov.patch | 4 +- .../Configurable-RCON-IP-address.patch | 4 +- .../Do-not-load-chunks-for-pathfinding.patch | 4 +- ...hunks-as-active-for-neighbor-updates.patch | 4 +- ...y-scoreboard-teams-to-scoreboard.dat.patch | 4 +- .../Entity-Tracking-Improvements.patch | 4 +- ...ityRegainHealthEvent-isFastRegen-API.patch | 4 +- ...r-redstone-torch-rapid-clock-removal.patch | 4 +- .../Implement-PlayerLocaleChangeEvent.patch | 4 +- ...item-frames-performance-and-bug-fixe.patch | 4 +- ...Improve-Minecraft-Hopper-Performance.patch | 4 +- ...-API-Replenishable-Lootables-Feature.patch | 4 +- ...EntityItem-loads-before-EntityPotion.patch | 4 +- Spigot-Server-Patches/Optimize-EAR.patch | 4 +- .../Optimize-UserCache-Thread-Safe.patch | 4 +- .../Optional-old-TNT-cannon-behaviors.patch | 4 +- .../Prevent-Fire-from-loading-chunks.patch | 4 +- .../Reimplement-PlayerEditBookEvent.patch | 4 +- ...-dispenser-dropper-furnace-placement.patch | 4 +- ...tem-property-for-disabling-watchdoge.patch | 4 +- ...s-unloading-when-unload-is-cancelled.patch | 4 +- .../Vehicle-Event-Cancellation-Changes.patch | 4 +- ...-possibility-for-getServer-singleton.patch | 4 +- 27 files changed, 80 insertions(+), 78 deletions(-) delete mode 100644 Spigot-Server-Patches/Allow-capping-number-of-attempts-at-spawning-mobs.patch diff --git a/Spigot-Server-Patches/Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/Add-ability-to-configure-frosted_ice-properties.patch index cceb2b7f7f..8bccc258c3 100644 --- a/Spigot-Server-Patches/Add-ability-to-configure-frosted_ice-properties.patch +++ b/Spigot-Server-Patches/Add-ability-to-configure-frosted_ice-properties.patch @@ -9,8 +9,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -0,0 +0,0 @@ public class PaperWorldConfig { - } - } + private void useVanillaScoreboardColoring() { + useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false); } + + public boolean frostedIceEnabled = true; @@ -43,4 +43,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } } --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/Allow-capping-number-of-attempts-at-spawning-mobs.patch b/Spigot-Server-Patches/Allow-capping-number-of-attempts-at-spawning-mobs.patch deleted file mode 100644 index a46862afc2..0000000000 --- a/Spigot-Server-Patches/Allow-capping-number-of-attempts-at-spawning-mobs.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Fri, 15 Apr 2016 21:27:14 -0400 -Subject: [PATCH] Allow capping number of attempts at spawning mobs - -By default, this logic would loop endlessly trying to fill the world -with entities until it hits the worlds spawn. - -This patch will cap the # of attempts to so that the tick does not spend -extra long time on mob spawning - -diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -0,0 +0,0 @@ public class PaperWorldConfig { - private void useVanillaScoreboardColoring() { - useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false); - } -+ -+ public int maxMobSpawnAttempts; -+ private void maxMobSpawnAttempts() { -+ maxMobSpawnAttempts = getInt("max-mob-spawn-attempts", 250); -+ log( "Max Mob Spawn Attempts: " + maxMobSpawnAttempts); -+ if (maxMobSpawnAttempts < 0) { -+ maxMobSpawnAttempts = Integer.MAX_VALUE; -+ } else { -+ if (maxMobSpawnAttempts < 250 && PaperConfig.version < 10) { -+ set("max-mob-spawn-attempts", 250); -+ maxMobSpawnAttempts = 250; -+ } -+ } -+ } - } -diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/server/SpawnerCreature.java -+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java -@@ -0,0 +0,0 @@ public final class SpawnerCreature { - Iterator iterator1 = this.b.iterator(); - - int moblimit = (limit * i / 256) - mobcnt + 1; // Spigot - up to 1 more than limit -+ int maxMobSpawnAttempts = worldserver.paperConfig.maxMobSpawnAttempts; // Paper - max attempts - label120: -- while (iterator1.hasNext() && (moblimit > 0)) { // Spigot - while more allowed -+ while (iterator1.hasNext() && (moblimit > 0) && maxMobSpawnAttempts-- > 0) { // Spigot - while more allowed // Paper - max attempts - // CraftBukkit start = use LongHash and LongObjectHashMap - long key = ((Long) iterator1.next()).longValue(); - BlockPosition blockposition1 = getRandomPosition(worldserver, LongHash.msw(key), LongHash.lsw(key)); --- \ No newline at end of file diff --git a/Spigot-Server-Patches/Arrow-pickup-rule-API.patch b/Spigot-Server-Patches/Arrow-pickup-rule-API.patch index 12d3bd1249..0c735644d7 100644 --- a/Spigot-Server-Patches/Arrow-pickup-rule-API.patch +++ b/Spigot-Server-Patches/Arrow-pickup-rule-API.patch @@ -53,4 +53,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 // Spigot start private final Arrow.Spigot spigot = new Arrow.Spigot() { --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/Avoid-blocking-on-Network-Manager-creation.patch index 2b4fc92bdf..51c7789c1e 100644 --- a/Spigot-Server-Patches/Avoid-blocking-on-Network-Manager-creation.patch +++ b/Spigot-Server-Patches/Avoid-blocking-on-Network-Manager-creation.patch @@ -44,4 +44,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 // This prevents players from 'gaming' the server, and strategically relogging to increase their position in the tick order if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 ) { --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/Check-entity-count-additions-and-mark-entities-remov.patch b/Spigot-Server-Patches/Check-entity-count-additions-and-mark-entities-remov.patch index d1526e47c9..5336f32ad4 100644 --- a/Spigot-Server-Patches/Check-entity-count-additions-and-mark-entities-remov.patch +++ b/Spigot-Server-Patches/Check-entity-count-additions-and-mark-entities-remov.patch @@ -66,4 +66,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 int i1 = MathHelper.floor(entity.locZ / 16.0D); if (!entity.aa || entity.ab != k || entity.ac != l || entity.ad != i1) { --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/Configurable-RCON-IP-address.patch index 2196c5697d..804af14a78 100644 --- a/Spigot-Server-Patches/Configurable-RCON-IP-address.patch +++ b/Spigot-Server-Patches/Configurable-RCON-IP-address.patch @@ -18,4 +18,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 this.i = iminecraftserver.e_(); if (0 == this.h) { this.h = this.i + 10; --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/Do-not-load-chunks-for-pathfinding.patch index b94da4c9b5..6f14ad2842 100644 --- a/Spigot-Server-Patches/Do-not-load-chunks-for-pathfinding.patch +++ b/Spigot-Server-Patches/Do-not-load-chunks-for-pathfinding.patch @@ -17,4 +17,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } } --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/Spigot-Server-Patches/Do-not-mark-chunks-as-active-for-neighbor-updates.patch index ef72d0c476..0de0468e7c 100644 --- a/Spigot-Server-Patches/Do-not-mark-chunks-as-active-for-neighbor-updates.patch +++ b/Spigot-Server-Patches/Do-not-mark-chunks-as-active-for-neighbor-updates.patch @@ -108,4 +108,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (neighbor != null) { neighbor.setNeighborLoaded(-x, -z); chunk.setNeighborLoaded(x, z); --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch index 2bbd65e3f0..803d7b5b67 100644 --- a/Spigot-Server-Patches/Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch +++ b/Spigot-Server-Patches/Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch @@ -30,4 +30,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 NBTTagCompound nbttagcompound = new NBTTagCompound(); nbttagcompound.setString("Name", scoreboardteam.getName()); --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/Entity-Tracking-Improvements.patch index 7b9b861384..20fde246e2 100644 --- a/Spigot-Server-Patches/Entity-Tracking-Improvements.patch +++ b/Spigot-Server-Patches/Entity-Tracking-Improvements.patch @@ -98,4 +98,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } } --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/EntityRegainHealthEvent-isFastRegen-API.patch index 55a2280656..7144c6d431 100644 --- a/Spigot-Server-Patches/EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-Server-Patches/EntityRegainHealthEvent-isFastRegen-API.patch @@ -40,4 +40,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 this.a(f); this.foodTickTimer = 0; } --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/Faster-redstone-torch-rapid-clock-removal.patch index 89a9ca1a40..8b43931e84 100644 --- a/Spigot-Server-Patches/Faster-redstone-torch-rapid-clock-removal.patch +++ b/Spigot-Server-Patches/Faster-redstone-torch-rapid-clock-removal.patch @@ -38,4 +38,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public RedstoneUpdateInfo(BlockPosition blockposition, long i) { this.a = blockposition; --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/Implement-PlayerLocaleChangeEvent.patch index e5b3b7cdb4..42d5f20954 100644 --- a/Spigot-Server-Patches/Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/Implement-PlayerLocaleChangeEvent.patch @@ -48,4 +48,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } @Override --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index 7e9b08a7b4..f8bc2a10d6 100644 --- a/Spigot-Server-Patches/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/Spigot-Server-Patches/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -144,4 +144,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public final ArrayList cursors; public RenderData() { --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/Improve-Minecraft-Hopper-Performance.patch b/Spigot-Server-Patches/Improve-Minecraft-Hopper-Performance.patch index 4061553cb0..20f50a9034 100644 --- a/Spigot-Server-Patches/Improve-Minecraft-Hopper-Performance.patch +++ b/Spigot-Server-Patches/Improve-Minecraft-Hopper-Performance.patch @@ -73,4 +73,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public boolean o() { return this.g > 0; } --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch index 442e398954..b1ea5d261c 100644 --- a/Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch +++ b/Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch @@ -728,4 +728,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 private final CraftInventory inventory; CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) { --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/MC-99914-ensure-EntityItem-loads-before-EntityPotion.patch b/Spigot-Server-Patches/MC-99914-ensure-EntityItem-loads-before-EntityPotion.patch index 03e275e415..a6aea30462 100644 --- a/Spigot-Server-Patches/MC-99914-ensure-EntityItem-loads-before-EntityPotion.patch +++ b/Spigot-Server-Patches/MC-99914-ensure-EntityItem-loads-before-EntityPotion.patch @@ -28,4 +28,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 // Try to see if we're actually running in a terminal, disable jline if not if (System.console() == null && System.getProperty("jline.terminal") == null) { System.setProperty("jline.terminal", "jline.UnsupportedTerminal"); --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/Optimize-EAR.patch b/Spigot-Server-Patches/Optimize-EAR.patch index f20bbbdfc0..96e54a347b 100644 --- a/Spigot-Server-Patches/Optimize-EAR.patch +++ b/Spigot-Server-Patches/Optimize-EAR.patch @@ -64,4 +64,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } } } --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/Optimize-UserCache-Thread-Safe.patch index 23a9f7fd41..2033731bd4 100644 --- a/Spigot-Server-Patches/Optimize-UserCache-Thread-Safe.patch +++ b/Spigot-Server-Patches/Optimize-UserCache-Thread-Safe.patch @@ -95,4 +95,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/Optional-old-TNT-cannon-behaviors.patch b/Spigot-Server-Patches/Optional-old-TNT-cannon-behaviors.patch index 4473f8c42f..a0ba09a5ed 100644 --- a/Spigot-Server-Patches/Optional-old-TNT-cannon-behaviors.patch +++ b/Spigot-Server-Patches/Optional-old-TNT-cannon-behaviors.patch @@ -390,4 +390,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (entity instanceof EntityHuman) { EntityHuman entityhuman = (EntityHuman) entity; --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/Prevent-Fire-from-loading-chunks.patch index e647081ba0..a0f4d78a44 100644 --- a/Spigot-Server-Patches/Prevent-Fire-from-loading-chunks.patch +++ b/Spigot-Server-Patches/Prevent-Fire-from-loading-chunks.patch @@ -44,4 +44,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } return i; --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/Reimplement-PlayerEditBookEvent.patch b/Spigot-Server-Patches/Reimplement-PlayerEditBookEvent.patch index 4c75f171b6..5a4b119ed9 100644 --- a/Spigot-Server-Patches/Reimplement-PlayerEditBookEvent.patch +++ b/Spigot-Server-Patches/Reimplement-PlayerEditBookEvent.patch @@ -84,4 +84,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch b/Spigot-Server-Patches/SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch index 71b24f8dc5..4aae7c6ec0 100644 --- a/Spigot-Server-Patches/SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch +++ b/Spigot-Server-Patches/SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch @@ -50,4 +50,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public boolean interact(World world, BlockPosition blockposition, IBlockData iblockdata, EntityHuman entityhuman, EnumHand enumhand, @Nullable ItemStack itemstack, EnumDirection enumdirection, float f, float f1, float f2) { if (world.isClientSide) { --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/System-property-for-disabling-watchdoge.patch index 7ec4d8aa14..bcd8ec31f5 100644 --- a/Spigot-Server-Patches/System-property-for-disabling-watchdoge.patch +++ b/Spigot-Server-Patches/System-property-for-disabling-watchdoge.patch @@ -17,4 +17,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 { Logger log = Bukkit.getServer().getLogger(); log.log( Level.SEVERE, "The server has stopped responding!" ); --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/Unmark-chunk-as-unloading-when-unload-is-cancelled.patch b/Spigot-Server-Patches/Unmark-chunk-as-unloading-when-unload-is-cancelled.patch index 32d0f815e7..bbc1525d1b 100644 --- a/Spigot-Server-Patches/Unmark-chunk-as-unloading-when-unload-is-cancelled.patch +++ b/Spigot-Server-Patches/Unmark-chunk-as-unloading-when-unload-is-cancelled.patch @@ -29,4 +29,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 // CraftBukkit start ChunkUnloadEvent event = new ChunkUnloadEvent(chunk.bukkitChunk); this.world.getServer().getPluginManager().callEvent(event); --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/Vehicle-Event-Cancellation-Changes.patch index f03fea7895..a55f9360cf 100644 --- a/Spigot-Server-Patches/Vehicle-Event-Cancellation-Changes.patch +++ b/Spigot-Server-Patches/Vehicle-Event-Cancellation-Changes.patch @@ -89,4 +89,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 protected boolean q(Entity entity) { return this.bv().size() < 1; } --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) + diff --git a/Spigot-Server-Patches/remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/remove-null-possibility-for-getServer-singleton.patch index daea82d232..0f27cb4eca 100644 --- a/Spigot-Server-Patches/remove-null-possibility-for-getServer-singleton.patch +++ b/Spigot-Server-Patches/remove-null-possibility-for-getServer-singleton.patch @@ -34,4 +34,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } // CraftBukkit end --- \ No newline at end of file +-- +2.7.4 (Apple Git-66) +