mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 01:12:47 +01:00
abba3d113b
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: bb813f6f SPIGOT-4605: Warn against hacking physics CraftBukkit Changes:2ced0233Don't handle sync packets for kicked playersd5e96882SPIGOT-4602: Cache reflection in decompile error workaround Spigot Changes: b0f4c22b SPIGOT-4605: Catch more physics problems
39 lines
2.2 KiB
Diff
39 lines
2.2 KiB
Diff
From 66294924c12de6f6629939c1f80582f443480e83 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 5788ec6f6..5ff06d247 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -1124,10 +1124,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
|
|
// 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
|
|
@@ -1191,9 +1191,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
|
|
// 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.20.1
|
|
|