mirror/Paper
2
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 07:20:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
751317f21b
Paper/Spigot-Server-Patches/0289-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch

90 lines
4.1 KiB
Diff
Raw Normal View History

Merge branch 'master' into pre/1.13 * master: MC-135506: Experience should save as Integers Fix EXP orb merging causing values to go negative - Closes #1169 Add "Safe Regen" Duplicate UUID resolver and make default
2018-08-03 13:29:20 +08:00
From 5141b8c2ab3839058f95e6bbc02d06eb04d48a54 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 15:56:57 +08: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
Merge branch 'master' into pre/1.13 * master: MC-135506: Experience should save as Integers Fix EXP orb merging causing values to go negative - Closes #1169 Add "Safe Regen" Duplicate UUID resolver and make default
2018-08-03 13:29:20 +08:00
index d2e87693fa..1997cbdc65 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 15:56:57 +08:00
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-19 07:16:19 +08:00
@@ -721,6 +721,7 @@ public class Chunk implements IChunkAccess {
((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 15:56:57 +08: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 07:16:19 +08: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 15:56:57 +08:00
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
Merge branch 'master' into pre/1.13 * master: MC-135506: Experience should save as Integers Fix EXP orb merging causing values to go negative - Closes #1169 Add "Safe Regen" Duplicate UUID resolver and make default
2018-08-03 13:29:20 +08:00
index 0f56969270..29678af2de 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 15:56:57 +08:00
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
Merge branch 'master' into pre/1.13 * master: MC-135506: Experience should save as Integers Fix EXP orb merging causing values to go negative - Closes #1169 Add "Safe Regen" Duplicate UUID resolver and make default
2018-08-03 13:29:20 +08:00
@@ -1220,12 +1220,15 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
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 15:56:57 +08:00
int j;
// Paper start - Set based removal lists
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-19 07:16:19 +08: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 15:56:57 +08:00
+ /*
j = e.getChunkZ();
int k = e.getChunkX();
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-19 07:16:19 +08: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 15:56:57 +08:00
this.getChunkAt(k, j).b(e);
- }
+ }*/
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-19 07:16:19 +08: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 15:56:57 +08:00
+ if (chunk != null) chunk.removeEntity(e);
}
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-19 07:16:19 +08:00
for (Entity e : this.g) {
Merge branch 'master' into pre/1.13 * master: MC-135506: Experience should save as Integers Fix EXP orb merging causing values to go negative - Closes #1169 Add "Safe Regen" Duplicate UUID resolver and make default
2018-08-03 13:29:20 +08:00
@@ -1286,12 +1289,17 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-19 07:16:19 +08: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 15:56:57 +08: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 07:16:19 +08: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 15:56:57 +08:00
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-19 07:16:19 +08: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 15:56:57 +08:00
this.getChunkAt(j, l).b(entity);
- }
+ }*/
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-19 07:16:19 +08: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 15:56:57 +08:00
+ if (chunk != null) chunk.removeEntity(entity);
+ // Paper end
guardEntityList = false; // Spigot
this.entityList.remove(this.tickPosition--); // CraftBukkit - Use field for loop variable
Merge branch 'master' into pre/1.13 * master: MC-135506: Experience should save as Integers Fix EXP orb merging causing values to go negative - Closes #1169 Add "Safe Regen" Duplicate UUID resolver and make default
2018-08-03 13:29:20 +08:00
@@ -1336,7 +1344,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
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 15:56:57 +08: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)
shouldTick = shouldTick && !chunk.isUnloading() && chunk.scheduledForUnload == null;
Merge branch 'master' into pre/1.13 * master: MC-135506: Experience should save as Integers Fix EXP orb merging causing values to go negative - Closes #1169 Add "Safe Regen" Duplicate UUID resolver and make default
2018-08-03 13:29:20 +08:00
@@ -1372,8 +1380,11 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
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 15:56:57 +08: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-05 05:29:10 +08: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 15:56:57 +08: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-05 05:29:10 +08: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 15:56:57 +08:00
+ // Paper end
}
}
Missed a case where to remove a chunk lookup on TE removal (performance, not bug fix)
2018-07-05 05:29:10 +08: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 15:56:57 +08:00
--
Multitude of changes to attempt to fix #1199
2018-07-13 04:42:56 +08:00
2.18.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 15:56:57 +08:00
Reference in New Issue Copy Permalink