Paper/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch

40 lines
2.2 KiB
Diff
Raw Normal View History

From e7d0420983298221e86f3959e98a9acd7cbcc059 Mon Sep 17 00:00:00 2001
2015-10-17 10:43:03 +08:00
From: Zach Brown <zach.brown@destroystokyo.com>
2016-03-01 07:09:49 +08:00
Date: Wed, 2 Mar 2016 23:45:17 -0600
2015-10-17 10:43:03 +08:00
Subject: [PATCH] Disable spigot tick limiters
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 9e192b7c04..8b90b13d15 100644
2015-10-17 10:43:03 +08:00
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1167,10 +1167,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
// CraftBukkit start - Use field for loop variable
2016-03-25 12:59:37 +08:00
co.aikar.timings.TimingHistory.entityTicks += this.entityList.size(); // Paper
2015-10-17 10:43:03 +08:00
int entitiesThisCycle = 0;
- if (tickPosition < 0) tickPosition = 0;
- for (entityLimiter.initTick();
2015-10-17 10:43:03 +08:00
- entitiesThisCycle < entityList.size() && (entitiesThisCycle % 10 != 0 || entityLimiter.shouldContinue());
- tickPosition++, entitiesThisCycle++) {
2016-03-01 07:09:49 +08:00
+ // Paper start - Disable tick limiters
+ //if (tickPosition < 0) tickPosition = 0;
+ for (tickPosition = 0; tickPosition < entityList.size(); tickPosition++) {
2016-03-01 07:09:49 +08:00
+ // Paper end
2015-10-17 10:43:03 +08:00
tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
entity = (Entity) this.entityList.get(this.tickPosition);
// CraftBukkit end
@@ -1234,9 +1234,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
2015-10-17 10:43:03 +08:00
// Spigot start
2016-03-01 07:09:49 +08:00
// Iterator iterator = this.tileEntityListTick.iterator();
2015-10-17 10:43:03 +08:00
int tilesThisCycle = 0;
- for (tileLimiter.initTick();
2016-03-01 07:09:49 +08:00
- tilesThisCycle < tileEntityListTick.size() && (tilesThisCycle % 10 != 0 || tileLimiter.shouldContinue());
- tileTickPosition++, tilesThisCycle++) {
2016-03-01 07:09:49 +08:00
+ for (tileTickPosition = 0; tileTickPosition < tileEntityListTick.size(); tileTickPosition++) { // Paper - Disable tick limiters
tileTickPosition = (tileTickPosition < tileEntityListTick.size()) ? tileTickPosition : 0;
TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition);
// Spigot start
2015-10-17 10:43:03 +08:00
--
2.18.0
2015-10-17 10:43:03 +08:00