39 lines
2.1 KiB
Diff
39 lines
2.1 KiB
Diff
From 2c2e25a2ebff5602a158022297d13a46cc9fdf9a Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
Date: Wed, 2 Mar 2016 23:45:17 -0600
|
|
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 31730fe35..41a0f5a62 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -1428,10 +1428,10 @@ public abstract class World implements IBlockAccess {
|
|
// CraftBukkit start - Use field for loop variable
|
|
co.aikar.timings.TimingHistory.entityTicks += this.entityList.size(); // Paper
|
|
int entitiesThisCycle = 0;
|
|
- if (tickPosition < 0) tickPosition = 0;
|
|
- for (entityLimiter.initTick();
|
|
- entitiesThisCycle < entityList.size() && (entitiesThisCycle % 10 != 0 || entityLimiter.shouldContinue());
|
|
- tickPosition++, entitiesThisCycle++) {
|
|
+ // Paper start - Disable tick limiters
|
|
+ //if (tickPosition < 0) tickPosition = 0;
|
|
+ for (tickPosition = 0; tickPosition < entityList.size(); tickPosition++) {
|
|
+ // Paper end
|
|
tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
|
|
entity = (Entity) this.entityList.get(this.tickPosition);
|
|
// CraftBukkit end
|
|
@@ -1495,9 +1495,7 @@ public abstract class World implements IBlockAccess {
|
|
// Spigot start
|
|
// Iterator iterator = this.tileEntityListTick.iterator();
|
|
int tilesThisCycle = 0;
|
|
- for (tileLimiter.initTick();
|
|
- tilesThisCycle < tileEntityListTick.size() && (tilesThisCycle % 10 != 0 || tileLimiter.shouldContinue());
|
|
- tileTickPosition++, tilesThisCycle++) {
|
|
+ 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
|
|
--
|
|
2.14.1
|
|
|