core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0287-Avoid-Chunk-Lookups-fo...

90 lines
4.1 KiB
Diff
Raw Normal View History

Updated Upstream (Bukkit/CraftBukkit), deprecate SentientNPC API Upstream has added the equivalent of our SentientNPC API, with exception to the EnderDragon. We've added Mob to the EnderDragon, and our SentientNPC API should behave the same. Vex#getOwner has been deprecated and a replacement Vex#getSummoner has been added using Mob. However, since 1.13 is not production ready, SentientNPC API is subject for removal in 1.13.1 since 1.13 API is not compatible with 1.12. Please move to the Mob interface ASAP. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: c5ab54d8 Expand GameRule API ab9a606c Improve entity hierarchy by adding Mob interface. CraftBukkit Changes: 29e75648 Expand GameRule API 50e6858b Improve entity hierarchy by adding Mob interface. 0e1d79b4 Correct error in previous patch
2018-08-11 02:13:00 +00:00
From 679d49837ab776c02a12d6e1a93206606520080b 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 07:56:57 +00: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 05:29:20 +00: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 07:56:57 +00: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-18 23:16:19 +00: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 07:56:57 +00: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-18 23:16:19 +00: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 07:56:57 +00:00
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
[Auto] Update Upstream Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes: a9c796f1 SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations 195f071e SPIGOT-4219: Event for PigZombies angering. 5e3082c7 SPIGOT-4230: Improve legacy block types
2018-08-05 23:46:43 +00:00
index 852977cab3..fbca973225 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 07:56:57 +00: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: Fix logic bug in negative XP bug fix - Closes #1169
2018-08-04 01:20:57 +00:00
@@ -1221,12 +1221,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 07:56:57 +00:00
int j;
// Paper start - Set based removal lists
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-18 23:16:19 +00: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 07:56:57 +00:00
+ /*
j = e.getChunkZ();
int k = e.getChunkX();
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-18 23:16:19 +00: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 07:56:57 +00:00
this.getChunkAt(k, j).b(e);
- }
+ }*/
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-18 23:16:19 +00: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 07:56:57 +00:00
+ if (chunk != null) chunk.removeEntity(e);
}
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-18 23:16:19 +00:00
for (Entity e : this.g) {
Merge branch 'master' into pre/1.13 * master: Fix logic bug in negative XP bug fix - Closes #1169
2018-08-04 01:20:57 +00:00
@@ -1287,12 +1290,17 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-18 23:16:19 +00: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 07:56:57 +00:00
this.methodProfiler.a("remove");
if (entity.dead) {
+ // Paper start
+ /*
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-18 23:16:19 +00: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 07:56:57 +00:00
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-18 23:16:19 +00: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 07:56:57 +00:00
this.getChunkAt(j, l).b(entity);
- }
+ }*/
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-18 23:16:19 +00: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 07:56:57 +00: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: Fix logic bug in negative XP bug fix - Closes #1169
2018-08-04 01:20:57 +00:00
@@ -1337,7 +1345,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 07:56:57 +00: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: Fix logic bug in negative XP bug fix - Closes #1169
2018-08-04 01:20:57 +00:00
@@ -1373,8 +1381,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 07:56:57 +00: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 21:29:10 +00: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 07:56:57 +00: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 21:29:10 +00: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 07:56:57 +00:00
+ // Paper end
}
}
Missed a case where to remove a chunk lookup on TE removal (performance, not bug fix)
2018-07-04 21:29:10 +00: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 07:56:57 +00:00
--
Multitude of changes to attempt to fix #1199
2018-07-12 20:42:56 +00: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 07:56:57 +00:00