From 54b4afaa840b547d4daff7b725242d6f55b78068 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 3 Jan 2022 08:38:18 +1100 Subject: [PATCH] SPIGOT-6881: Add option to ignore spectators in entity-activation-range --- .../0012-Entity-Activation-Range.patch | 23 +++++++++++-------- .../0014-Entity-Tracking-Ranges.patch | 12 +++++----- .../0016-Hopper-Customisations.patch | 6 ++--- .../0027-Arrow-Despawn-Rate.patch | 6 ++--- ...Disabling-Zombie-Villager-Aggression.patch | 6 ++--- ...dd-Option-to-Nerf-Mobs-from-Spawners.patch | 6 ++--- ...f-ZombiePigmen-spawning-in-portal-bl.patch | 6 ++--- ...dragon-death-and-wither-spawn-sounds.patch | 6 ++--- .../0066-Further-Seed-Customisation.patch | 6 ++--- .../0077-Add-Hunger-Config-Values.patch | 6 ++--- .../0079-Limit-TNT-Detonations-per-tick.patch | 8 +++---- .../0080-Configurable-Hanging-Tick.patch | 6 ++--- ...-Allow-Capping-Tile-Entity-Tick-Time.patch | 8 +++---- .../0093-Configurable-Thunder-Chance.patch | 8 +++---- ...4-Configurable-Below-Zero-Generation.patch | 8 +++---- 15 files changed, 62 insertions(+), 59 deletions(-) diff --git a/CraftBukkit-Patches/0012-Entity-Activation-Range.patch b/CraftBukkit-Patches/0012-Entity-Activation-Range.patch index a0ca645c..eeb03aeb 100644 --- a/CraftBukkit-Patches/0012-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0012-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From de19059c4689a696113c8a38eb492a8482313cc6 Mon Sep 17 00:00:00 2001 +From 55c6d7ca8524c22466a088fc13d45e36b478ae82 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Feb 2013 05:10:21 -0500 Subject: [PATCH] Entity Activation Range @@ -263,15 +263,13 @@ index aff7b6b43..d3328a695 100644 public static final HashMap pluginTaskTimingMap = new HashMap(); diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java new file mode 100644 -index 000000000..4bf7d4781 +index 000000000..1939b9856 --- /dev/null +++ b/src/main/java/org/spigotmc/ActivationRange.java -@@ -0,0 +1,261 @@ +@@ -0,0 +1,262 @@ +package org.spigotmc; + -+import java.util.Collection; +import net.minecraft.server.MinecraftServer; -+import net.minecraft.util.MathHelper; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityCreature; +import net.minecraft.world.entity.EntityExperienceOrb; @@ -297,7 +295,6 @@ index 000000000..4bf7d4781 +import net.minecraft.world.entity.projectile.EntityThrownTrident; +import net.minecraft.world.entity.raid.EntityRaider; +import net.minecraft.world.level.World; -+import net.minecraft.world.level.chunk.Chunk; +import net.minecraft.world.phys.AxisAlignedBB; +import org.bukkit.craftbukkit.SpigotTimings; + @@ -392,8 +389,12 @@ index 000000000..4bf7d4781 + + for ( EntityHuman player : world.players() ) + { -+ + player.activatedTick = MinecraftServer.currentTick; ++ if ( world.spigotConfig.ignoreSpectatorActivation && player.isSpectator() ) ++ { ++ continue; ++ } ++ + maxBB = player.getBoundingBox().inflate( maxRange, 256, maxRange ); + ActivationType.MISC.boundingBox = player.getBoundingBox().inflate( miscActivationRange, 256, miscActivationRange ); + ActivationType.RAIDER.boundingBox = player.getBoundingBox().inflate( raiderActivationRange, 256, raiderActivationRange ); @@ -529,10 +530,10 @@ index 000000000..4bf7d4781 + } +} diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 9fc17f219..90b765bdf 100644 +index 9fc17f219..8daa6784a 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -188,4 +188,19 @@ public class SpigotWorldConfig +@@ -188,4 +188,21 @@ public class SpigotWorldConfig itemDespawnRate = getInt( "item-despawn-rate", 6000 ); log( "Item Despawn Rate: " + itemDespawnRate ); } @@ -542,6 +543,7 @@ index 9fc17f219..90b765bdf 100644 + public int raiderActivationRange = 48; + public int miscActivationRange = 16; + public boolean tickInactiveVillagers = true; ++ public boolean ignoreSpectatorActivation = false; + private void activationRange() + { + animalActivationRange = getInt( "entity-activation-range.animals", animalActivationRange ); @@ -549,7 +551,8 @@ index 9fc17f219..90b765bdf 100644 + raiderActivationRange = getInt( "entity-activation-range.raiders", raiderActivationRange ); + miscActivationRange = getInt( "entity-activation-range.misc", miscActivationRange ); + tickInactiveVillagers = getBoolean( "entity-activation-range.tick-inactive-villagers", tickInactiveVillagers ); -+ log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Ra " + raiderActivationRange + " / Mi " + miscActivationRange + " / Tiv " + tickInactiveVillagers ); ++ ignoreSpectatorActivation = getBoolean( "entity-activation-range.ignore-spectators", ignoreSpectatorActivation ); ++ log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Ra " + raiderActivationRange + " / Mi " + miscActivationRange + " / Tiv " + tickInactiveVillagers + " / Isa " + ignoreSpectatorActivation ); + } } -- diff --git a/CraftBukkit-Patches/0014-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0014-Entity-Tracking-Ranges.patch index b0694547..19c9bf86 100644 --- a/CraftBukkit-Patches/0014-Entity-Tracking-Ranges.patch +++ b/CraftBukkit-Patches/0014-Entity-Tracking-Ranges.patch @@ -1,4 +1,4 @@ -From b3e80b0dfafdf12936155ce5a007956ca8948270 Mon Sep 17 00:00:00 2001 +From 321e3e7ba358c6a91d2fe69019e7855afa61fcf8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Feb 2013 11:58:47 -0500 Subject: [PATCH] Entity Tracking Ranges @@ -12,7 +12,7 @@ This has multiple benefits: 4) Less client lag - Not trying to render distant item frames and paintings and entities will reduce entity count on the client, which is major for shop/town worlds which may use tons of item frames. diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java -index 1ec12a956..a47a8bf8c 100644 +index 096e94e80..869042018 100644 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java @@ -1192,6 +1192,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.e { @@ -24,12 +24,12 @@ index 1ec12a956..a47a8bf8c 100644 if (i != 0) { int j = entitytypes.updateInterval(); diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 90b765bdf..af2c5cba4 100644 +index 8daa6784a..ee822b2a3 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -203,4 +203,19 @@ public class SpigotWorldConfig - tickInactiveVillagers = getBoolean( "entity-activation-range.tick-inactive-villagers", tickInactiveVillagers ); - log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Ra " + raiderActivationRange + " / Mi " + miscActivationRange + " / Tiv " + tickInactiveVillagers ); +@@ -205,4 +205,19 @@ public class SpigotWorldConfig + ignoreSpectatorActivation = getBoolean( "entity-activation-range.ignore-spectators", ignoreSpectatorActivation ); + log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Ra " + raiderActivationRange + " / Mi " + miscActivationRange + " / Tiv " + tickInactiveVillagers + " / Isa " + ignoreSpectatorActivation ); } + + public int playerTrackingRange = 48; diff --git a/CraftBukkit-Patches/0016-Hopper-Customisations.patch b/CraftBukkit-Patches/0016-Hopper-Customisations.patch index b9cc83f0..7af735ee 100644 --- a/CraftBukkit-Patches/0016-Hopper-Customisations.patch +++ b/CraftBukkit-Patches/0016-Hopper-Customisations.patch @@ -1,4 +1,4 @@ -From ebab6162360cff530f62ff6cac3728832b7c0fbb Mon Sep 17 00:00:00 2001 +From 60d506bc8ca62abda81465ec55320a012b4a65e7 Mon Sep 17 00:00:00 2001 From: erocs Date: Sun, 8 Sep 2013 12:06:15 -0700 Subject: [PATCH] Hopper Customisations @@ -136,10 +136,10 @@ index b8f5c6ad0..92f93542c 100644 } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index af2c5cba4..dd280d22a 100644 +index ee822b2a3..a03727d59 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -218,4 +218,20 @@ public class SpigotWorldConfig +@@ -220,4 +220,20 @@ public class SpigotWorldConfig otherTrackingRange = getInt( "entity-tracking-range.other", otherTrackingRange ); log( "Entity Tracking Range: Pl " + playerTrackingRange + " / An " + animalTrackingRange + " / Mo " + monsterTrackingRange + " / Mi " + miscTrackingRange + " / Other " + otherTrackingRange ); } diff --git a/CraftBukkit-Patches/0027-Arrow-Despawn-Rate.patch b/CraftBukkit-Patches/0027-Arrow-Despawn-Rate.patch index d6ce1123..3ce4ddca 100644 --- a/CraftBukkit-Patches/0027-Arrow-Despawn-Rate.patch +++ b/CraftBukkit-Patches/0027-Arrow-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From 3aa2ab5d65bd818cc2c08b1a7b96b7d82959e739 Mon Sep 17 00:00:00 2001 +From 6427b2f7c287a1c0f60e496dc98aeefe81bb6752 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Oct 2013 19:20:10 +1100 Subject: [PATCH] Arrow Despawn Rate @@ -18,10 +18,10 @@ index db1bd7c1d..07730d9f4 100644 } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index dd280d22a..59aa2a65e 100644 +index a03727d59..b16c9e292 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -234,4 +234,13 @@ public class SpigotWorldConfig +@@ -236,4 +236,13 @@ public class SpigotWorldConfig hopperAmount = getInt( "hopper-amount", 1 ); log( "Hopper Transfer: " + hopperTransfer + " Hopper Check: " + hopperCheck + " Hopper Amount: " + hopperAmount ); } diff --git a/CraftBukkit-Patches/0032-Allow-Disabling-Zombie-Villager-Aggression.patch b/CraftBukkit-Patches/0032-Allow-Disabling-Zombie-Villager-Aggression.patch index e5b8b8cf..820a50d0 100644 --- a/CraftBukkit-Patches/0032-Allow-Disabling-Zombie-Villager-Aggression.patch +++ b/CraftBukkit-Patches/0032-Allow-Disabling-Zombie-Villager-Aggression.patch @@ -1,4 +1,4 @@ -From d954d301b56c653b216cd57cbc907112b59b7cae Mon Sep 17 00:00:00 2001 +From 4d032bc79da0af1e303fb8e419974b0829c83574 Mon Sep 17 00:00:00 2001 From: Dylan Xaldin Date: Thu, 12 Dec 2013 18:05:03 -0600 Subject: [PATCH] Allow Disabling Zombie Villager Aggression @@ -19,10 +19,10 @@ index 2d970e961..0b6e0e927 100644 this.targetSelector.addGoal(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.BABY_ON_LAND_SELECTOR)); } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 59aa2a65e..a66b7f707 100644 +index b16c9e292..e8d87c4b2 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -243,4 +243,11 @@ public class SpigotWorldConfig +@@ -245,4 +245,11 @@ public class SpigotWorldConfig tridentDespawnRate = getInt( "trident-despawn-rate", arrowDespawnRate ); log( "Arrow Despawn Rate: " + arrowDespawnRate + " Trident Respawn Rate:" + tridentDespawnRate ); } diff --git a/CraftBukkit-Patches/0036-Add-Option-to-Nerf-Mobs-from-Spawners.patch b/CraftBukkit-Patches/0036-Add-Option-to-Nerf-Mobs-from-Spawners.patch index 5398a41e..1a8bde59 100644 --- a/CraftBukkit-Patches/0036-Add-Option-to-Nerf-Mobs-from-Spawners.patch +++ b/CraftBukkit-Patches/0036-Add-Option-to-Nerf-Mobs-from-Spawners.patch @@ -1,4 +1,4 @@ -From fab4178b20ad71808e5ada70ac232f3aed6f181b Mon Sep 17 00:00:00 2001 +From b6b1cad2b58525a29ba3f1abdb9e2dcb120fd8e7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Feb 2014 16:55:46 +0000 Subject: [PATCH] Add Option to Nerf Mobs from Spawners @@ -22,10 +22,10 @@ index 67d177856..e4e42ae6a 100644 if (!worldserver.tryAddFreshEntityWithPassengers(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER)) { // CraftBukkit diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index a66b7f707..9d832b617 100644 +index e8d87c4b2..e5e1f112b 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -250,4 +250,11 @@ public class SpigotWorldConfig +@@ -252,4 +252,11 @@ public class SpigotWorldConfig zombieAggressiveTowardsVillager = getBoolean( "zombie-aggressive-towards-villager", true ); log( "Zombie Aggressive Towards Villager: " + zombieAggressiveTowardsVillager ); } diff --git a/CraftBukkit-Patches/0041-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch b/CraftBukkit-Patches/0041-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch index e83aa083..380c34de 100644 --- a/CraftBukkit-Patches/0041-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch +++ b/CraftBukkit-Patches/0041-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch @@ -1,4 +1,4 @@ -From 29f39544bb6e6209ec63d4a2f0366a60201ed6b3 Mon Sep 17 00:00:00 2001 +From 54c99c02aa2c1e4738bb795f93744a56b737d6a1 Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Mon, 20 Jan 2014 20:18:23 +0000 Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks @@ -18,10 +18,10 @@ index 7a8b19ccc..a3ad3a5ab 100644 blockposition = blockposition.below(); } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 9d832b617..780ad6132 100644 +index e5e1f112b..280d1a4b1 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -257,4 +257,11 @@ public class SpigotWorldConfig +@@ -259,4 +259,11 @@ public class SpigotWorldConfig nerfSpawnerMobs = getBoolean( "nerf-spawner-mobs", false ); log( "Nerfing mobs spawned from spawners: " + nerfSpawnerMobs ); } diff --git a/CraftBukkit-Patches/0052-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0052-Configurable-dragon-death-and-wither-spawn-sounds.patch index ea72071a..b7634898 100644 --- a/CraftBukkit-Patches/0052-Configurable-dragon-death-and-wither-spawn-sounds.patch +++ b/CraftBukkit-Patches/0052-Configurable-dragon-death-and-wither-spawn-sounds.patch @@ -1,4 +1,4 @@ -From 4399ffbaed6a3012b8868b8d6f74e21d92b68def Mon Sep 17 00:00:00 2001 +From e93d96ce2cc0f31fbc758170fefdd17921b41aed Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 29 Mar 2014 13:44:25 -0400 Subject: [PATCH] Configurable dragon death and wither spawn sounds @@ -78,10 +78,10 @@ index e9cd69067..db32c5390 100644 return EnumInteractionResult.CONSUME; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 780ad6132..731ddd13a 100644 +index 280d1a4b1..0b76be971 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -264,4 +264,22 @@ public class SpigotWorldConfig +@@ -266,4 +266,22 @@ public class SpigotWorldConfig enableZombiePigmenPortalSpawns = getBoolean( "enable-zombie-pigmen-portal-spawns", true ); log( "Allow Zombie Pigmen to spawn from portal blocks: " + enableZombiePigmenPortalSpawns ); } diff --git a/CraftBukkit-Patches/0066-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0066-Further-Seed-Customisation.patch index 8c4c418c..d1af3476 100644 --- a/CraftBukkit-Patches/0066-Further-Seed-Customisation.patch +++ b/CraftBukkit-Patches/0066-Further-Seed-Customisation.patch @@ -1,4 +1,4 @@ -From bdb9b853bc76a421741b42de928dd93224df83a6 Mon Sep 17 00:00:00 2001 +From 0cabf20f09e35db8e49192890bec79392882bd62 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 4 Jul 2014 13:28:45 +1000 Subject: [PATCH] Further Seed Customisation @@ -164,10 +164,10 @@ index 1008a62e4..41899df00 100644 @Override diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 731ddd13a..958b97100 100644 +index 0b76be971..4a03e5b25 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -282,4 +282,42 @@ public class SpigotWorldConfig +@@ -284,4 +284,42 @@ public class SpigotWorldConfig { endPortalSoundRadius = getInt( "end-portal-sound-radius", 0 ); } diff --git a/CraftBukkit-Patches/0077-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0077-Add-Hunger-Config-Values.patch index 72dc886d..0273ec7c 100644 --- a/CraftBukkit-Patches/0077-Add-Hunger-Config-Values.patch +++ b/CraftBukkit-Patches/0077-Add-Hunger-Config-Values.patch @@ -1,4 +1,4 @@ -From 1ae8349ae7e1c542d0f74a3d7b391ce72bd8a9ee Mon Sep 17 00:00:00 2001 +From 01d11db8c6662d14ec929383155d3927f197dc53 Mon Sep 17 00:00:00 2001 From: lazertester Date: Sun, 17 Aug 2014 19:56:17 +1000 Subject: [PATCH] Add Hunger Config Values @@ -83,10 +83,10 @@ index 94531cafc..0dc5a9998 100644 } } else if (this.foodLevel <= 0) { diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 958b97100..044f54992 100644 +index 4a03e5b25..984045831 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -320,4 +320,30 @@ public class SpigotWorldConfig +@@ -322,4 +322,30 @@ public class SpigotWorldConfig log( "Custom Map Seeds: Village: " + villageSeed + " Desert: " + desertSeed + " Igloo: " + iglooSeed + " Jungle: " + jungleSeed + " Swamp: " + swampSeed + " Monument: " + monumentSeed + " Ocean: " + oceanSeed + " Shipwreck: " + shipwreckSeed + " End City: " + endCitySeed + " Slime: " + slimeSeed + " Bastion: " + bastionSeed + " Fortress: " + fortressSeed + " Mansion: " + mansionSeed + " Fossil: " + fossilSeed + " Portal: " + portalSeed ); } diff --git a/CraftBukkit-Patches/0079-Limit-TNT-Detonations-per-tick.patch b/CraftBukkit-Patches/0079-Limit-TNT-Detonations-per-tick.patch index 0b6f351d..bd986a7d 100644 --- a/CraftBukkit-Patches/0079-Limit-TNT-Detonations-per-tick.patch +++ b/CraftBukkit-Patches/0079-Limit-TNT-Detonations-per-tick.patch @@ -1,4 +1,4 @@ -From c3b4c3f991c5005efd9fc21cc2d568d597ec5252 Mon Sep 17 00:00:00 2001 +From 81ae7e8e76f394b9732cbbf5c1d988b87e0963b6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Aug 2014 18:12:32 -0400 Subject: [PATCH] Limit TNT Detonations per tick @@ -19,7 +19,7 @@ index dce854ccc..a3ced6037 100644 this.setDeltaMovement(this.getDeltaMovement().add(0.0D, -0.04D, 0.0D)); } diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java -index a9a545d61..d8ed48c9c 100644 +index 538ac7a9d..78e81d890 100644 --- a/src/main/java/net/minecraft/world/level/World.java +++ b/src/main/java/net/minecraft/world/level/World.java @@ -680,6 +680,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -31,10 +31,10 @@ index a9a545d61..d8ed48c9c 100644 public void guardEntityTick(Consumer consumer, T t0) { diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 044f54992..ac05bf0fe 100644 +index 984045831..c4c1fe9ca 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -346,4 +346,15 @@ public class SpigotWorldConfig +@@ -348,4 +348,15 @@ public class SpigotWorldConfig sprintMultiplier = (float) getDouble( "hunger.sprint-multiplier", 0.1 ); otherMultiplier = (float) getDouble( "hunger.other-multiplier", 0.0 ); } diff --git a/CraftBukkit-Patches/0080-Configurable-Hanging-Tick.patch b/CraftBukkit-Patches/0080-Configurable-Hanging-Tick.patch index 23b8a194..29e474b8 100644 --- a/CraftBukkit-Patches/0080-Configurable-Hanging-Tick.patch +++ b/CraftBukkit-Patches/0080-Configurable-Hanging-Tick.patch @@ -1,4 +1,4 @@ -From 75e7fc597b82fd2870196809f9c98bd4fca255fa Mon Sep 17 00:00:00 2001 +From e00995ffad8efd8f2d27e0302dc70a9af5186db4 Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 9 Aug 2014 13:56:51 -0400 Subject: [PATCH] Configurable Hanging Tick @@ -18,10 +18,10 @@ index 0a79a2eee..b47fd1c13 100644 if (!this.isRemoved() && !this.survives()) { // CraftBukkit start - fire break events diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index ac05bf0fe..8de2b1fec 100644 +index c4c1fe9ca..8e265b5f6 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -357,4 +357,10 @@ public class SpigotWorldConfig +@@ -359,4 +359,10 @@ public class SpigotWorldConfig maxTntTicksPerTick = getInt( "max-tnt-per-tick", 100 ); log( "Max TNT Explosions: " + maxTntTicksPerTick ); } diff --git a/CraftBukkit-Patches/0082-Allow-Capping-Tile-Entity-Tick-Time.patch b/CraftBukkit-Patches/0082-Allow-Capping-Tile-Entity-Tick-Time.patch index f53243b9..c455ba0a 100644 --- a/CraftBukkit-Patches/0082-Allow-Capping-Tile-Entity-Tick-Time.patch +++ b/CraftBukkit-Patches/0082-Allow-Capping-Tile-Entity-Tick-Time.patch @@ -1,4 +1,4 @@ -From 67387132b5a0096742d3648765084411a7bef678 Mon Sep 17 00:00:00 2001 +From fbd97a2c32dec85a2a65753566dd240582071e48 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 20 Feb 2015 21:39:31 +1100 Subject: [PATCH] Allow Capping (Tile)Entity Tick Time. @@ -10,7 +10,7 @@ For tiles there is very little tradeoff for this option, as tile ticks are based This feature was commisioned by Chunkr. diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java -index d8ed48c9c..951dbaba7 100644 +index 78e81d890..733b4d9e4 100644 --- a/src/main/java/net/minecraft/world/level/World.java +++ b/src/main/java/net/minecraft/world/level/World.java @@ -151,6 +151,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -68,10 +68,10 @@ index d8ed48c9c..951dbaba7 100644 tickingblockentity.tick(); } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 8de2b1fec..8dd45fc9b 100644 +index 8e265b5f6..682408c1f 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -363,4 +363,13 @@ public class SpigotWorldConfig +@@ -365,4 +365,13 @@ public class SpigotWorldConfig { hangingTickFrequency = getInt( "hanging-tick-frequency", 100 ); } diff --git a/CraftBukkit-Patches/0093-Configurable-Thunder-Chance.patch b/CraftBukkit-Patches/0093-Configurable-Thunder-Chance.patch index aac303fa..94418597 100644 --- a/CraftBukkit-Patches/0093-Configurable-Thunder-Chance.patch +++ b/CraftBukkit-Patches/0093-Configurable-Thunder-Chance.patch @@ -1,11 +1,11 @@ -From 99319d04b7fb796bfb323735682c43f3d6fdf340 Mon Sep 17 00:00:00 2001 +From 80c5cd0a1c9d868bab0f0b7c12777de2d1c04bfe Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 24 Oct 2021 20:29:25 +1100 Subject: [PATCH] Configurable Thunder Chance diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java -index d86e64f5b..fab7aeb71 100644 +index 8501bfee1..a9554fe50 100644 --- a/src/main/java/net/minecraft/server/level/WorldServer.java +++ b/src/main/java/net/minecraft/server/level/WorldServer.java @@ -466,7 +466,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -18,10 +18,10 @@ index d86e64f5b..fab7aeb71 100644 if (this.isRainingAt(blockposition)) { DifficultyDamageScaler difficultydamagescaler = this.getCurrentDifficultyAt(blockposition); diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 8dd45fc9b..1706a7c3f 100644 +index 682408c1f..2d2d5d622 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -372,4 +372,10 @@ public class SpigotWorldConfig +@@ -374,4 +374,10 @@ public class SpigotWorldConfig entityMaxTickTime = getInt("max-tick-time.entity", 50); log("Tile Max Tick Time: " + tileMaxTickTime + "ms Entity max Tick Time: " + entityMaxTickTime + "ms"); } diff --git a/CraftBukkit-Patches/0094-Configurable-Below-Zero-Generation.patch b/CraftBukkit-Patches/0094-Configurable-Below-Zero-Generation.patch index 9d7b8c73..2a22944d 100644 --- a/CraftBukkit-Patches/0094-Configurable-Below-Zero-Generation.patch +++ b/CraftBukkit-Patches/0094-Configurable-Below-Zero-Generation.patch @@ -1,4 +1,4 @@ -From e6a9c381fe63a60d8d7913cd420b0596b4217704 Mon Sep 17 00:00:00 2001 +From 5845086ddc640e474fc5d4102eefe72df1ade91b Mon Sep 17 00:00:00 2001 From: DerFrZocker Date: Sun, 28 Nov 2021 12:09:29 +1100 Subject: [PATCH] Configurable Below Zero Generation @@ -37,7 +37,7 @@ index b5eb33275..1e3c7fc4b 100644 return nbttagcompound; } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index f3d75d19c..59c6ed862 100644 +index c47a8b670..aab9684a7 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -398,4 +398,9 @@ public class SpigotConfig @@ -51,10 +51,10 @@ index f3d75d19c..59c6ed862 100644 + } } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 1706a7c3f..40aff34e5 100644 +index 2d2d5d622..eb5369c37 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -378,4 +378,9 @@ public class SpigotWorldConfig +@@ -380,4 +380,9 @@ public class SpigotWorldConfig { thunderChance = getInt("thunder-chance", 100000); }