twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 04:32:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect logic in entity tick limiter to match tile entity tick limiter.

Browse Source 
Simply a fix to the small performance shortpath.
This commit is contained in:
md_5
2015-10-07 17:23:59 +11:00
parent 2d37e27b37
commit af5daaeeeb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CraftBukkit-Patches/0152-Allow-Capping-Tile-Entity-Tick-Time.patch
View File

@@ -40,7 +40,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ int entitiesThisCycle = 0; + int entitiesThisCycle = 0;
+ if (tickPosition < 0) tickPosition = 0; + if (tickPosition < 0) tickPosition = 0;
+ for (entityLimiter.initTick(); + for (entityLimiter.initTick();
+ entitiesThisCycle < entityList.size() && (entitiesThisCycle % 10 == 0 || entityLimiter.shouldContinue()); + entitiesThisCycle < entityList.size() && (entitiesThisCycle % 10 != 0 || entityLimiter.shouldContinue());
+ tickPosition++, entitiesThisCycle++) { + tickPosition++, entitiesThisCycle++) {
+ tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0; + tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
entity = (Entity) this.entityList.get(this.tickPosition); entity = (Entity) this.entityList.get(this.tickPosition);
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // Spigot start + // Spigot start
+ int tilesThisCycle = 0; + int tilesThisCycle = 0;
+ for (tileLimiter.initTick(); + for (tileLimiter.initTick();
+ tilesThisCycle < tileEntityList.size() && (tilesThisCycle % 10 == 0 || tileLimiter.shouldContinue()); + tilesThisCycle < tileEntityList.size() && (tilesThisCycle % 10 != 0 || tileLimiter.shouldContinue());
+ tileTickPosition++, tilesThisCycle++) { + tileTickPosition++, tilesThisCycle++) {
+ tileTickPosition = (tileTickPosition < tileEntityList.size()) ? tileTickPosition : 0; + tileTickPosition = (tileTickPosition < tileEntityList.size()) ? tileTickPosition : 0;
+ TileEntity tileentity = (TileEntity) this.tileEntityList.get(tileTickPosition); + TileEntity tileentity = (TileEntity) this.tileEntityList.get(tileTickPosition);