mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 06:58:11 +02:00
This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail.
40 lines
2.2 KiB
Diff
40 lines
2.2 KiB
Diff
From bae9f32e5b3c4025e471f44ffb7a431ea750826d 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 04493a1f9..d988fd007 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -1143,10 +1143,10 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
|
|
// 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
|
|
@@ -1210,9 +1210,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
|
|
// 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.18.0
|
|
|