Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-09 04:09:54 +01:00
Code Issues Projects Releases Wiki Activity
515f2e7beb
Paper/Spigot-Server-Patches/0285-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch

90 lines
4.1 KiB
Diff
Raw Normal View History

Improve Light Queue and force enable it for all There is no reason for the light queue to even be an option. This enables the light queue for everyone. This also improves the "can we still tick" time logic to always check before running a light operation. previously, we always executed at least 10 on the first world (but not other worlds...), but we are seeing light take up some heavy time, so improving that for now. I've now also improved recheck gaps logic to happen at the end of all single block updates This also prevents multiple gap checks, as previously if a tick skipped the gaps check, the next tick would end up re-adding the entry again, resulting in multiple gap checks. This now just sets a marker "We need to recheck gaps" and will only occur once. This also should reduce chunk loads, as previously, we checked if the neighbor chunks were loaded for the gap check, however those neighbor chunks might of unloaded before the light queue operation actually ran. Now, the neighbor chunk is done when the gap check is being done, so it should avoid loading chunks. Fixes #1466 Fixes #1431
2018-09-22 17:46:31 +02:00
From e9cd3efda6cfbe48f2c343c4efbd63bb2fdfa894 Mon Sep 17 00:00:00 2001
Avoid Chunk Lookups for Entity/TileEntity Current Chunk In many places where we simply want the current chunk the entity is in, instead of doing a hashmap lookup for it, we now have access to the object directly on the Entity/TileEntity object we can directly grab. Use that local value instead to reduce lookups in many hot places.
2018-07-04 09:56:57 +02:00
From: Aikar <aikar@aikar.co>
Date: Wed, 4 Jul 2018 03:39:51 -0400
Subject: [PATCH] Avoid Chunk Lookups for Entity/TileEntity Current Chunk
In many places where we simply want the current chunk the entity
is in, instead of doing a hashmap lookup for it, we now have access
to the object directly on the Entity/TileEntity object we can directly grab.
Use that local value instead to reduce lookups in many hot places.
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
Improve Light Queue and force enable it for all There is no reason for the light queue to even be an option. This enables the light queue for everyone. This also improves the "can we still tick" time logic to always check before running a light operation. previously, we always executed at least 10 on the first world (but not other worlds...), but we are seeing light take up some heavy time, so improving that for now. I've now also improved recheck gaps logic to happen at the end of all single block updates This also prevents multiple gap checks, as previously if a tick skipped the gaps check, the next tick would end up re-adding the entry again, resulting in multiple gap checks. This now just sets a marker "We need to recheck gaps" and will only occur once. This also should reduce chunk loads, as previously, we checked if the neighbor chunks were loaded for the gap check, however those neighbor chunks might of unloaded before the light queue operation actually ran. Now, the neighbor chunk is done when the gap check is being done, so it should avoid loading chunks. Fixes #1466 Fixes #1431
2018-09-22 17:46:31 +02:00
index 9f2a08b03d..0dab65c870 100644
Avoid Chunk Lookups for Entity/TileEntity Current Chunk In many places where we simply want the current chunk the entity is in, instead of doing a hashmap lookup for it, we now have access to the object directly on the Entity/TileEntity object we can directly grab. Use that local value instead to reduce lookups in many hot places.
2018-07-04 09:56:57 +02:00
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
Improve Light Queue and force enable it for all There is no reason for the light queue to even be an option. This enables the light queue for everyone. This also improves the "can we still tick" time logic to always check before running a light operation. previously, we always executed at least 10 on the first world (but not other worlds...), but we are seeing light take up some heavy time, so improving that for now. I've now also improved recheck gaps logic to happen at the end of all single block updates This also prevents multiple gap checks, as previously if a tick skipped the gaps check, the next tick would end up re-adding the entry again, resulting in multiple gap checks. This now just sets a marker "We need to recheck gaps" and will only occur once. This also should reduce chunk loads, as previously, we checked if the neighbor chunks were loaded for the gap check, however those neighbor chunks might of unloaded before the light queue operation actually ran. Now, the neighbor chunk is done when the gap check is being done, so it should avoid loading chunks. Fixes #1466 Fixes #1431
2018-09-22 17:46:31 +02:00
@@ -719,6 +719,7 @@ public class Chunk implements IChunkAccess {
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-19 01:16:19 +02:00
((HeightMap) this.heightMap.get(heightmap_type)).a(along);
Avoid Chunk Lookups for Entity/TileEntity Current Chunk In many places where we simply want the current chunk the entity is in, instead of doing a hashmap lookup for it, we now have access to the object directly on the Entity/TileEntity object we can directly grab. Use that local value instead to reduce lookups in many hot places.
2018-07-04 09:56:57 +02:00
}
+ public void removeEntity(Entity entity) { b(entity); } // Paper - OBFHELPER
public void b(Entity entity) {
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-19 01:16:19 +02:00
this.a(entity, entity.af);
Avoid Chunk Lookups for Entity/TileEntity Current Chunk In many places where we simply want the current chunk the entity is in, instead of doing a hashmap lookup for it, we now have access to the object directly on the Entity/TileEntity object we can directly grab. Use that local value instead to reduce lookups in many hot places.
2018-07-04 09:56:57 +02:00
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
Ensure mobs don't spawn out of world border this is originally what I thought #1333 was, but wasn't, but this is still valid fix
2018-09-18 03:50:02 +02:00
index 7cf4a9c11e..ee2cdb897c 100644
Avoid Chunk Lookups for Entity/TileEntity Current Chunk In many places where we simply want the current chunk the entity is in, instead of doing a hashmap lookup for it, we now have access to the object directly on the Entity/TileEntity object we can directly grab. Use that local value instead to reduce lookups in many hot places.
2018-07-04 09:56:57 +02:00
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
Ensure mobs don't spawn out of world border this is originally what I thought #1333 was, but wasn't, but this is still valid fix
2018-09-18 03:50:02 +02:00
@@ -1258,12 +1258,15 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
Avoid Chunk Lookups for Entity/TileEntity Current Chunk In many places where we simply want the current chunk the entity is in, instead of doing a hashmap lookup for it, we now have access to the object directly on the Entity/TileEntity object we can directly grab. Use that local value instead to reduce lookups in many hot places.
2018-07-04 09:56:57 +02:00
int j;
// Paper start - Set based removal lists
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-19 01:16:19 +02:00
for (Entity e : this.g) {
Avoid Chunk Lookups for Entity/TileEntity Current Chunk In many places where we simply want the current chunk the entity is in, instead of doing a hashmap lookup for it, we now have access to the object directly on the Entity/TileEntity object we can directly grab. Use that local value instead to reduce lookups in many hot places.
2018-07-04 09:56:57 +02:00
+ /*
j = e.getChunkZ();
int k = e.getChunkX();
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-19 01:16:19 +02:00
if (e.inChunk && this.isChunkLoaded(k, j, true)) {
Avoid Chunk Lookups for Entity/TileEntity Current Chunk In many places where we simply want the current chunk the entity is in, instead of doing a hashmap lookup for it, we now have access to the object directly on the Entity/TileEntity object we can directly grab. Use that local value instead to reduce lookups in many hot places.
2018-07-04 09:56:57 +02:00
this.getChunkAt(k, j).b(e);
- }
+ }*/
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-19 01:16:19 +02:00
+ Chunk chunk = e.inChunk ? e.getCurrentChunk() : null;
Avoid Chunk Lookups for Entity/TileEntity Current Chunk In many places where we simply want the current chunk the entity is in, instead of doing a hashmap lookup for it, we now have access to the object directly on the Entity/TileEntity object we can directly grab. Use that local value instead to reduce lookups in many hot places.
2018-07-04 09:56:57 +02:00
+ if (chunk != null) chunk.removeEntity(e);
}
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-19 01:16:19 +02:00
for (Entity e : this.g) {
Ensure mobs don't spawn out of world border this is originally what I thought #1333 was, but wasn't, but this is still valid fix
2018-09-18 03:50:02 +02:00
@@ -1324,12 +1327,17 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-19 01:16:19 +02:00
this.methodProfiler.e();
Avoid Chunk Lookups for Entity/TileEntity Current Chunk In many places where we simply want the current chunk the entity is in, instead of doing a hashmap lookup for it, we now have access to the object directly on the Entity/TileEntity object we can directly grab. Use that local value instead to reduce lookups in many hot places.
2018-07-04 09:56:57 +02:00
this.methodProfiler.a("remove");
if (entity.dead) {
+ // Paper start
+ /*
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-19 01:16:19 +02:00
j = entity.ae;
int l = entity.ag;
Avoid Chunk Lookups for Entity/TileEntity Current Chunk In many places where we simply want the current chunk the entity is in, instead of doing a hashmap lookup for it, we now have access to the object directly on the Entity/TileEntity object we can directly grab. Use that local value instead to reduce lookups in many hot places.
2018-07-04 09:56:57 +02:00
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-19 01:16:19 +02:00
if (entity.inChunk && this.isChunkLoaded(j, l, true)) {
Avoid Chunk Lookups for Entity/TileEntity Current Chunk In many places where we simply want the current chunk the entity is in, instead of doing a hashmap lookup for it, we now have access to the object directly on the Entity/TileEntity object we can directly grab. Use that local value instead to reduce lookups in many hot places.
2018-07-04 09:56:57 +02:00
this.getChunkAt(j, l).b(entity);
- }
+ }*/
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-19 01:16:19 +02:00
+ Chunk chunk = entity.inChunk ? entity.getCurrentChunk() : null;
Avoid Chunk Lookups for Entity/TileEntity Current Chunk In many places where we simply want the current chunk the entity is in, instead of doing a hashmap lookup for it, we now have access to the object directly on the Entity/TileEntity object we can directly grab. Use that local value instead to reduce lookups in many hot places.
2018-07-04 09:56:57 +02:00
+ if (chunk != null) chunk.removeEntity(entity);
+ // Paper end
guardEntityList = false; // Spigot
this.entityList.remove(this.tickPosition--); // CraftBukkit - Use field for loop variable
Ensure mobs don't spawn out of world border this is originally what I thought #1333 was, but wasn't, but this is still valid fix
2018-09-18 03:50:02 +02:00
@@ -1374,7 +1382,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
Avoid Chunk Lookups for Entity/TileEntity Current Chunk In many places where we simply want the current chunk the entity is in, instead of doing a hashmap lookup for it, we now have access to the object directly on the Entity/TileEntity object we can directly grab. Use that local value instead to reduce lookups in many hot places.
2018-07-04 09:56:57 +02:00
BlockPosition blockposition = tileentity.getPosition();
// Paper start - Skip ticking in chunks scheduled for unload
- net.minecraft.server.Chunk chunk = this.getChunkIfLoaded(blockposition);
+ net.minecraft.server.Chunk chunk = tileentity.getCurrentChunk();
boolean shouldTick = chunk != null;
if(this.paperConfig.skipEntityTickingInChunksScheduledForUnload)
Paper 1.13.1 Update Updated Upstream (Bukkit/CraftBukkit/Spigot) Bukkit Changes: 2dcc44dc SPIGOT-4307: Fix hacky API for banners on shields e0fc6572 SPIGOT-4309: Add "forced" display of particles efeeab2f Add index to README.md for easier navigation f502bc6f Update to Minecraft 1.13.1 CraftBukkit Changes: d0bb0a1d Fix some tests randomly failing 997d378d Fix client stall in specific teleportation scenarios b3dc2366 SPIGOT-4307: Fix hacky API for banners on shields 2a271162 SPIGOT-4301: Fix more invalid enchants 5d0d83bb SPIGOT-4309: Add "forced" display of particles a6772578 Add additional tests for CraftBlockData ce1af0c3 Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1
2018-08-26 20:11:49 +02:00
shouldTick = shouldTick && chunk.scheduledForUnload == null;
Ensure mobs don't spawn out of world border this is originally what I thought #1333 was, but wasn't, but this is still valid fix
2018-09-18 03:50:02 +02:00
@@ -1410,8 +1418,11 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
Avoid Chunk Lookups for Entity/TileEntity Current Chunk In many places where we simply want the current chunk the entity is in, instead of doing a hashmap lookup for it, we now have access to the object directly on the Entity/TileEntity object we can directly grab. Use that local value instead to reduce lookups in many hot places.
2018-07-04 09:56:57 +02:00
tilesThisCycle--;
this.tileEntityListTick.remove(tileTickPosition--);
//this.tileEntityList.remove(tileentity); // Paper - remove unused list
- if (this.isLoaded(tileentity.getPosition())) {
Missed a case where to remove a chunk lookup on TE removal (performance, not bug fix)
2018-07-04 23:29:10 +02:00
- this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition());
Avoid Chunk Lookups for Entity/TileEntity Current Chunk In many places where we simply want the current chunk the entity is in, instead of doing a hashmap lookup for it, we now have access to the object directly on the Entity/TileEntity object we can directly grab. Use that local value instead to reduce lookups in many hot places.
2018-07-04 09:56:57 +02:00
+ // Paper start
+ net.minecraft.server.Chunk chunk = tileentity.getCurrentChunk();
+ if (chunk != null) {
Missed a case where to remove a chunk lookup on TE removal (performance, not bug fix)
2018-07-04 23:29:10 +02:00
+ chunk.removeTileEntity(tileentity.getPosition());
Avoid Chunk Lookups for Entity/TileEntity Current Chunk In many places where we simply want the current chunk the entity is in, instead of doing a hashmap lookup for it, we now have access to the object directly on the Entity/TileEntity object we can directly grab. Use that local value instead to reduce lookups in many hot places.
2018-07-04 09:56:57 +02:00
+ // Paper end
}
}
Missed a case where to remove a chunk lookup on TE removal (performance, not bug fix)
2018-07-04 23:29:10 +02:00
}
Avoid Chunk Lookups for Entity/TileEntity Current Chunk In many places where we simply want the current chunk the entity is in, instead of doing a hashmap lookup for it, we now have access to the object directly on the Entity/TileEntity object we can directly grab. Use that local value instead to reduce lookups in many hot places.
2018-07-04 09:56:57 +02:00
--
Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 47b9cf30 SPIGOT-4372: LightningStrikeEvent cause API a9ceda75 Include the plugin channel name in the exception message CraftBukkit Changes: a4bdecff SPIGOT-4372: LightningStrikeEvent cause API 34caaf6d SPIGOT-4371: Trident damaged when event cancelled 97315374 SPIGOT-4369: Handle cancelled trident event bf1c8273 SPIGOT-4370: Remove vehicle if its passenger spawn event was cancelled Spigot Changes: 6b015b4b SPIGOT-4370: Remove vehicle if its passenger spawn event was cancelled
2018-09-15 18:10:26 +02:00
2.19.0
Avoid Chunk Lookups for Entity/TileEntity Current Chunk In many places where we simply want the current chunk the entity is in, instead of doing a hashmap lookup for it, we now have access to the object directly on the Entity/TileEntity object we can directly grab. Use that local value instead to reduce lookups in many hot places.
2018-07-04 09:56:57 +02:00
Reference in New Issue Copy Permalink