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
17dca0a0fe
Paper/Spigot-Server-Patches/0005-Add-MinecraftKey-Information-to-Objects.patch

112 lines
4.1 KiB
Diff
Raw Normal View History

Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 11:57:31 +08:00
From de17c631c117b92a3cb3256819347d169ed0225b Mon Sep 17 00:00:00 2001
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 15:55:24 +08:00
From: Aikar <aikar@aikar.co>
Date: Wed, 4 Jul 2018 01:40:13 -0400
Subject: [PATCH] Add MinecraftKey Information to Objects
Stores the reference to the objects respective MinecraftKey
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 11:57:31 +08:00
index ed39b122ec..06c72b95f3 100644
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 15:55:24 +08:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -41,7 +41,7 @@ import org.bukkit.event.entity.EntityPortalEvent;
import org.bukkit.plugin.PluginManager;
// CraftBukkit end
-public abstract class Entity implements ICommandListener {
+public abstract class Entity implements ICommandListener, KeyedObject { // Paper
// CraftBukkit start
private static final int CURRENT_LEVEL = 2;
Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 11:57:31 +08:00
@@ -1702,11 +1702,28 @@ public abstract class Entity implements ICommandListener {
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 15:55:24 +08:00
return true;
}
+ // Paper start
Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 11:57:31 +08:00
+ private String entityKeyString = null;
+ private MinecraftKey entityKey = getMinecraftKey();
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 15:55:24 +08:00
+
+ @Override
+ public MinecraftKey getMinecraftKey() {
Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 11:57:31 +08:00
+ if (entityKey == null) {
+ entityKey = EntityTypes.getKey(this);
+ entityKeyString = entityKey != null ? entityKey.toString() : null;
+ }
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 15:55:24 +08:00
+ return entityKey;
+ }
+
+ @Override
+ public String getMinecraftKeyString() {
Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 11:57:31 +08:00
+ getMinecraftKey(); // Try to load if it doesn't exists. see: https://github.com/PaperMC/Paper/issues/1280
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 15:55:24 +08:00
+ return entityKeyString;
+ }
@Nullable
public final String getSaveID() {
- MinecraftKey minecraftkey = EntityTypes.a(this);
-
- return minecraftkey == null ? null : minecraftkey.toString();
Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 11:57:31 +08:00
+ return getMinecraftKeyString();
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 15:55:24 +08:00
+ // Paper end
}
protected abstract void a(NBTTagCompound nbttagcompound);
diff --git a/src/main/java/net/minecraft/server/KeyedObject.java b/src/main/java/net/minecraft/server/KeyedObject.java
new file mode 100644
Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 11:57:31 +08:00
index 0000000000..61c2b993c9
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 15:55:24 +08:00
--- /dev/null
+++ b/src/main/java/net/minecraft/server/KeyedObject.java
@@ -0,0 +1,8 @@
+package net.minecraft.server;
+
+public interface KeyedObject {
+ MinecraftKey getMinecraftKey();
+ default String getMinecraftKeyString() {
+ return getMinecraftKey().toString();
+ }
+}
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 11:57:31 +08:00
index 5a5a588e7c..0176ca530c 100644
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 15:55:24 +08:00
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -7,7 +7,7 @@ import org.apache.logging.log4j.Logger;
import org.spigotmc.CustomTimingsHandler; // Spigot
import org.bukkit.inventory.InventoryHolder; // CraftBukkit
-public abstract class TileEntity {
+public abstract class TileEntity implements KeyedObject {
public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getTileEntityTimings(this); // Spigot
private static final Logger a = LogManager.getLogger();
Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 11:57:31 +08:00
@@ -27,8 +27,26 @@ public abstract class TileEntity {
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 15:55:24 +08:00
TileEntity.f.a(new MinecraftKey(s), oclass);
}
- @Nullable
- public static MinecraftKey a(Class<? extends TileEntity> oclass) {
+ // Paper start
Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 11:57:31 +08:00
+ private String tileEntityKeyString = null;
+ private MinecraftKey tileEntityKey = getMinecraftKey();
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 15:55:24 +08:00
+
+ @Override
+ public MinecraftKey getMinecraftKey() {
Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 11:57:31 +08:00
+ if (tileEntityKey == null) {
+ tileEntityKey = getKey(this.getClass());
+ tileEntityKeyString = tileEntityKey != null ? tileEntityKey.toString() : null;
+ }
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 15:55:24 +08:00
+ return tileEntityKey;
+ }
+
+ @Override
+ public String getMinecraftKeyString() {
Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 11:57:31 +08:00
+ getMinecraftKey(); // Try to load if it doesn't exists.
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 15:55:24 +08:00
+ return tileEntityKeyString;
+ }
+ @Nullable public static MinecraftKey getKey(Class<? extends TileEntity> oclass) { return a(oclass); } // Paper - OBFHELPER
+ @Nullable public static MinecraftKey a(Class<? extends TileEntity> oclass) {
return (MinecraftKey) TileEntity.f.b(oclass);
}
--
2.18.0
Reference in New Issue Copy Permalink