Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-16 03:20:07 +01:00
Code Issues Projekte Releases Wiki Aktivität

port TE chunk lookup patch to 1.15 (#2757)

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Omer Uddin 2019-12-15 13:17:16 -05:00 committet von Shane Freeder
Ursprung 0585f99b05
Commit f3c55f239a
1 geänderte Dateien mit 17 neuen und 24 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

41
removed/1.14/0248-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch → Spigot-Server-Patches/0413-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
Datei anzeigen

@ -14,31 +14,34 @@ 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. Use that local value instead to reduce lookups in many hot places.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e3de63489..0e9530ea5 100644 index 985f30372..67159b8a8 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -762,7 +762,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -776,7 +776,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
if (!tileentity.isRemoved() && tileentity.hasWorld()) { if (!tileentity.isRemoved() && tileentity.hasWorld()) {
BlockPosition blockposition = tileentity.getPosition(); BlockPosition blockposition = tileentity.getPosition();
- if (this.chunkProvider.a(blockposition) && this.getWorldBorder().a(blockposition)) { - if (this.chunkProvider.a(blockposition) && this.getWorldBorder().a(blockposition)) {
+ Chunk currentChunk = tileentity.getCurrentChunk(); // Paper + if (tileentity.getCurrentChunk() != null && this.getWorldBorder().a(blockposition)) { // Paper
+ if (currentChunk != null && this.getWorldBorder().a(blockposition)) { // Paper
try { try {
gameprofilerfiller.a(() -> { gameprofilerfiller.a(() -> {
return String.valueOf(TileEntityTypes.a(tileentity.q())); return String.valueOf(TileEntityTypes.a(tileentity.getTileType()));
@@ -801,7 +802,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -815,8 +815,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
this.tileEntityListTick.remove(tileTickPosition--); this.tileEntityListTick.remove(tileTickPosition--);
// Spigot end // Spigot end
//this.tileEntityList.remove(tileentity); // Paper - remove unused list //this.tileEntityList.remove(tileentity); // Paper - remove unused list
- if (this.isLoaded(tileentity.getPosition())) { - if (this.isLoaded(tileentity.getPosition())) {
+ if (tileentity.getCurrentChunk() != null ) { // Paper - avoid lookups - this.getChunkAtWorldCoords(tileentity.getPosition()).removeTileEntity(tileentity.getPosition());
this.getChunkAtWorldCoords(tileentity.getPosition()).removeTileEntity(tileentity.getPosition()); + // Paper start - use local chunk reference
+ Chunk chunk = tileentity.getCurrentChunk();
+ if (chunk != null) {
+ chunk.removeTileEntity(tileentity.getPosition());
+ // Paper end
} }
} }
@@ -822,8 +823,9 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose }
@@ -836,8 +839,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
} }
// CraftBukkit end */ // CraftBukkit end */
@ -46,24 +49,14 @@ index e3de63489..0e9530ea5 100644
- Chunk chunk = this.getChunkAtWorldCoords(tileentity1.getPosition()); - Chunk chunk = this.getChunkAtWorldCoords(tileentity1.getPosition());
+ Chunk chunk = tileentity1.getCurrentChunk(); // Paper + Chunk chunk = tileentity1.getCurrentChunk(); // Paper
+ if (chunk != null) { // Paper + if (chunk != null) { // Paper
+ //Chunk chunk = this.getChunkAtWorldCoords(tileentity1.getPosition()); // Paper
IBlockData iblockdata = chunk.getType(tileentity1.getPosition()); IBlockData iblockdata = chunk.getType(tileentity1.getPosition());
chunk.setTileEntity(tileentity1.getPosition(), tileentity1); chunk.setTileEntity(tileentity1.getPosition(), tileentity1);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 067379252..340460a33 100644 index 83fb8737a..c473c7d16 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1061,7 +1061,7 @@ public class WorldServer extends World { @@ -1384,9 +1384,12 @@ public class WorldServer extends World {
}
this.entitiesByUUID.remove(entity.getUniqueID());
- this.getChunkProvider().removeEntity(entity);
+ this.getChunkProvider().removeEntity(entity); // Paper
if (entity instanceof EntityPlayer) {
EntityPlayer entityplayer = (EntityPlayer) entity;
@@ -1121,9 +1121,12 @@ public class WorldServer extends World {
} }
private void removeEntityFromChunk(Entity entity) { private void removeEntityFromChunk(Entity entity) {
@ -74,10 +67,10 @@ index 067379252..340460a33 100644
+ // Paper start + // Paper start
- if (ichunkaccess instanceof Chunk) { - if (ichunkaccess instanceof Chunk) {
+ if (ichunkaccess != null) { + if (ichunkaccess != null) { // Paper
((Chunk) ichunkaccess).b(entity); ((Chunk) ichunkaccess).b(entity);
} }
-- --
2.21.0 2.22.0