2016-03-16 07:21:39 +00:00
|
|
|
From 37a692b0821ce1ff9f58741dceb38a0f18cc795b Mon Sep 17 00:00:00 2001
|
2015-10-17 02:43:03 +00:00
|
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
2016-02-29 23:09:49 +00:00
|
|
|
Date: Wed, 2 Mar 2016 23:45:17 -0600
|
2015-10-17 02:43:03 +00: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
|
2016-03-16 07:21:39 +00:00
|
|
|
index de0a751..1815f79 100644
|
2015-10-17 02:43:03 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
2016-03-06 20:59:17 +00:00
|
|
|
@@ -1409,10 +1409,10 @@ public abstract class World implements IBlockAccess {
|
2015-10-24 07:12:33 +00:00
|
|
|
guardEntityList = true; // Spigot
|
|
|
|
// CraftBukkit start - Use field for loop variable
|
2015-10-17 02:43:03 +00:00
|
|
|
int entitiesThisCycle = 0;
|
2015-10-24 07:12:33 +00:00
|
|
|
- if (tickPosition < 0) tickPosition = 0;
|
|
|
|
- for (entityLimiter.initTick();
|
2015-10-17 02:43:03 +00:00
|
|
|
- entitiesThisCycle < entityList.size() && (entitiesThisCycle % 10 != 0 || entityLimiter.shouldContinue());
|
2015-10-24 07:12:33 +00:00
|
|
|
- tickPosition++, entitiesThisCycle++) {
|
2016-02-29 23:09:49 +00:00
|
|
|
+ // Paper start - Disable tick limiters
|
2015-10-24 07:12:33 +00:00
|
|
|
+ //if (tickPosition < 0) tickPosition = 0;
|
|
|
|
+ for (tickPosition = 0; tickPosition < entityList.size(); tickPosition++) {
|
2016-02-29 23:09:49 +00:00
|
|
|
+ // Paper end
|
2015-10-17 02:43:03 +00:00
|
|
|
tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
|
|
|
|
entity = (Entity) this.entityList.get(this.tickPosition);
|
2015-10-24 07:12:33 +00:00
|
|
|
// CraftBukkit end
|
2016-03-06 20:59:17 +00:00
|
|
|
@@ -1477,9 +1477,7 @@ public abstract class World implements IBlockAccess {
|
2015-10-17 02:43:03 +00:00
|
|
|
// Spigot start
|
2016-02-29 23:09:49 +00:00
|
|
|
// Iterator iterator = this.tileEntityListTick.iterator();
|
2015-10-17 02:43:03 +00:00
|
|
|
int tilesThisCycle = 0;
|
2015-10-24 07:12:33 +00:00
|
|
|
- for (tileLimiter.initTick();
|
2016-02-29 23:09:49 +00:00
|
|
|
- tilesThisCycle < tileEntityListTick.size() && (tilesThisCycle % 10 != 0 || tileLimiter.shouldContinue());
|
2015-10-24 07:12:33 +00:00
|
|
|
- tileTickPosition++, tilesThisCycle++) {
|
2016-02-29 23:09:49 +00: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);
|
2015-10-24 07:12:33 +00:00
|
|
|
// Spigot start
|
2015-10-17 02:43:03 +00:00
|
|
|
--
|
2016-02-29 23:09:49 +00:00
|
|
|
2.7.2
|
2015-10-17 02:43:03 +00:00
|
|
|
|