2019-04-23 06:47:07 +02:00
|
|
|
From f01b6961ade709b2e4076e4c8bc65ca191af034d Mon Sep 17 00:00:00 2001
|
2018-07-04 09:55:24 +02: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
|
|
|
|
|
2018-07-15 03:53:17 +02:00
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
|
2019-04-23 06:47:07 +02:00
|
|
|
index 2e79b0b5ff..f38179e983 100644
|
2018-07-15 03:53:17 +02:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
|
2019-04-05 06:35:59 +02:00
|
|
|
@@ -175,7 +175,7 @@ public class PaperCommand extends Command {
|
2018-07-15 03:53:17 +02:00
|
|
|
|
|
|
|
List<Entity> entities = world.entityList;
|
|
|
|
entities.forEach(e -> {
|
|
|
|
- MinecraftKey key = new MinecraftKey(""); // TODO: update in next patch
|
|
|
|
+ MinecraftKey key = e.getMinecraftKey();
|
|
|
|
|
|
|
|
MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
|
|
|
|
ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
|
2018-07-04 09:55:24 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
2019-04-23 06:47:07 +02:00
|
|
|
index cd998fcfb5..d9c9748cec 100644
|
2018-07-04 09:55:24 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2019-01-01 04:15:55 +01:00
|
|
|
@@ -44,7 +44,7 @@ import org.bukkit.event.entity.EntityPortalEvent;
|
2018-07-04 09:55:24 +02:00
|
|
|
import org.bukkit.plugin.PluginManager;
|
|
|
|
// CraftBukkit end
|
|
|
|
|
2018-07-15 03:53:17 +02:00
|
|
|
-public abstract class Entity implements INamableTileEntity, ICommandListener {
|
|
|
|
+public abstract class Entity implements INamableTileEntity, ICommandListener, KeyedObject { // Paper
|
2018-07-04 09:55:24 +02:00
|
|
|
|
|
|
|
// CraftBukkit start
|
|
|
|
private static final int CURRENT_LEVEL = 2;
|
2019-01-01 04:15:55 +01:00
|
|
|
@@ -72,7 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
|
2018-07-15 03:53:17 +02:00
|
|
|
private static final AxisAlignedBB b = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
|
|
|
|
private static double c = 1.0D;
|
|
|
|
private static int entityCount;
|
|
|
|
- private final EntityTypes<?> g;
|
|
|
|
+ private final EntityTypes<?> g; public EntityTypes<?> getEntityType() { return g; } // Paper - OBFHELPER
|
|
|
|
private int id;
|
|
|
|
public boolean j;
|
|
|
|
public final List<Entity> passengers;
|
2019-01-15 22:12:19 +01:00
|
|
|
@@ -1775,12 +1775,29 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
|
2018-07-04 09:55:24 +02:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
2018-07-27 06:44:53 +02:00
|
|
|
+ private MinecraftKey entityKey;
|
|
|
|
+ private String entityKeyString;
|
2018-07-04 09:55:24 +02:00
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public MinecraftKey getMinecraftKey() {
|
2018-07-27 06:44:53 +02:00
|
|
|
+ if (entityKey == null) {
|
|
|
|
+ this.entityKey = EntityTypes.getName(this.getEntityType());
|
|
|
|
+ this.entityKeyString = this.entityKey != null ? this.entityKey.toString() : null;
|
|
|
|
+ }
|
2018-07-04 09:55:24 +02:00
|
|
|
+ return entityKey;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public String getMinecraftKeyString() {
|
2018-07-27 06:44:53 +02:00
|
|
|
+ getMinecraftKey(); // Try to load if it doesn't exists. see: https://github.com/PaperMC/Paper/issues/1280
|
2018-07-04 09:55:24 +02:00
|
|
|
+ return entityKeyString;
|
|
|
|
+ }
|
|
|
|
@Nullable
|
|
|
|
public final String getSaveID() {
|
2019-01-01 04:15:55 +01:00
|
|
|
- EntityTypes<?> entitytypes = this.P();
|
2018-07-15 03:53:17 +02:00
|
|
|
- MinecraftKey minecraftkey = EntityTypes.getName(entitytypes);
|
2018-07-04 09:55:24 +02:00
|
|
|
-
|
2018-07-15 03:53:17 +02:00
|
|
|
- return entitytypes.a() && minecraftkey != null ? minecraftkey.toString() : null;
|
|
|
|
+ EntityTypes type = this.getEntityType();
|
2018-07-27 06:44:53 +02:00
|
|
|
+ return type != null && type.isPersistable() ? getMinecraftKeyString() : null;
|
2018-07-04 09:55:24 +02:00
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
|
|
|
protected abstract void a(NBTTagCompound nbttagcompound);
|
2018-07-15 03:53:17 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
|
2019-04-23 06:47:07 +02:00
|
|
|
index a07ee150c2..d74bfa1201 100644
|
2018-07-15 03:53:17 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityTypes.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
|
2018-08-26 20:11:49 +02:00
|
|
|
@@ -240,6 +240,7 @@ public class EntityTypes<T extends Entity> {
|
2018-07-15 03:53:17 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
+ public boolean isPersistable() { return a(); } // Paper - OBFHELPER
|
|
|
|
public boolean a() {
|
2018-08-26 20:11:49 +02:00
|
|
|
return this.aU;
|
2018-07-15 03:53:17 +02:00
|
|
|
}
|
2018-07-04 09:55:24 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/KeyedObject.java b/src/main/java/net/minecraft/server/KeyedObject.java
|
|
|
|
new file mode 100644
|
2019-04-23 06:47:07 +02:00
|
|
|
index 0000000000..743142d030
|
2018-07-04 09:55:24 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/net/minecraft/server/KeyedObject.java
|
2018-07-27 06:44:53 +02:00
|
|
|
@@ -0,0 +1,9 @@
|
2018-07-04 09:55:24 +02:00
|
|
|
+package net.minecraft.server;
|
|
|
|
+
|
|
|
|
+public interface KeyedObject {
|
|
|
|
+ MinecraftKey getMinecraftKey();
|
|
|
|
+ default String getMinecraftKeyString() {
|
2018-07-27 06:44:53 +02:00
|
|
|
+ MinecraftKey key = getMinecraftKey();
|
|
|
|
+ return key != null ? key.toString() : null;
|
2018-07-04 09:55:24 +02:00
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
|
2019-04-23 06:47:07 +02:00
|
|
|
index 62b6e6eb38..7390061bf0 100644
|
2018-07-04 09:55:24 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/TileEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/TileEntity.java
|
2018-07-15 03:53:17 +02:00
|
|
|
@@ -7,11 +7,11 @@ import org.apache.logging.log4j.Logger;
|
2018-07-04 09:55:24 +02:00
|
|
|
import org.spigotmc.CustomTimingsHandler; // Spigot
|
|
|
|
import org.bukkit.inventory.InventoryHolder; // CraftBukkit
|
|
|
|
|
|
|
|
-public abstract class TileEntity {
|
2018-07-27 06:44:53 +02:00
|
|
|
+public abstract class TileEntity implements KeyedObject { // Paper
|
2018-07-04 09:55:24 +02:00
|
|
|
|
|
|
|
public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getTileEntityTimings(this); // Spigot
|
|
|
|
private static final Logger a = LogManager.getLogger();
|
2018-07-15 03:53:17 +02:00
|
|
|
- private final TileEntityTypes<?> e;
|
|
|
|
+ private final TileEntityTypes<?> e; public TileEntityTypes getTileEntityType() { return e; } // Paper - OBFHELPER
|
|
|
|
protected World world;
|
|
|
|
protected BlockPosition position;
|
|
|
|
protected boolean d;
|
2018-07-27 06:44:53 +02:00
|
|
|
@@ -23,6 +23,26 @@ public abstract class TileEntity {
|
2018-07-15 03:53:17 +02:00
|
|
|
this.e = tileentitytypes;
|
2018-07-04 09:55:24 +02:00
|
|
|
}
|
|
|
|
|
2018-07-27 06:44:53 +02:00
|
|
|
+ // Paper start
|
|
|
|
+ private String tileEntityKeyString = null;
|
|
|
|
+ private MinecraftKey tileEntityKey = null;
|
2018-07-04 09:55:24 +02:00
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public MinecraftKey getMinecraftKey() {
|
2018-07-27 06:44:53 +02:00
|
|
|
+ if (tileEntityKey == null) {
|
|
|
|
+ tileEntityKey = TileEntityTypes.a(this.getTileEntityType());
|
|
|
|
+ tileEntityKeyString = tileEntityKey != null ? tileEntityKey.toString() : null;
|
|
|
|
+ }
|
2018-07-04 09:55:24 +02:00
|
|
|
+ return tileEntityKey;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public String getMinecraftKeyString() {
|
2018-07-27 06:44:53 +02:00
|
|
|
+ getMinecraftKey(); // Try to load if it doesn't exists.
|
2018-07-04 09:55:24 +02:00
|
|
|
+ return tileEntityKeyString;
|
|
|
|
+ }
|
2018-07-15 03:53:17 +02:00
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
@Nullable
|
|
|
|
public World getWorld() {
|
|
|
|
return this.world;
|
2018-07-04 09:55:24 +02:00
|
|
|
--
|
2019-04-05 06:35:59 +02:00
|
|
|
2.21.0
|
2018-07-04 09:55:24 +02:00
|
|
|
|