2021-06-11 12:02:28 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Mariell Hoversholm <proximyst@proximyst.com>
|
|
|
|
|
Date: Wed, 12 Aug 2020 11:33:04 +0200
|
|
|
|
|
Subject: [PATCH] Import fastutil classes
|
2021-06-14 10:42:08 +00:00
|
|
|
1.17: YEET
|
2021-06-15 03:50:26 +00:00
|
|
|
we use real mappings now so a class called 'it' in nms is no longer a concern
|
2021-06-11 12:02:28 +00:00
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java b/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java
|
|
|
|
|
index 95e166aa63f42c675df645a56e313bdffc2e8663..05f7d4a3835536f26f741d54a0884bd43fc82967 100644
|
|
|
|
|
--- a/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java
|
|
|
|
|
@@ -16,6 +16,7 @@ import net.minecraft.CrashReport;
|
|
|
|
|
import net.minecraft.ReportedException;
|
|
|
|
|
import net.minecraft.network.FriendlyByteBuf;
|
|
|
|
|
import net.minecraft.world.entity.Entity;
|
|
|
|
|
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; // Paper
|
|
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
|
|
import org.apache.logging.log4j.LogManager;
|
|
|
|
|
import org.apache.logging.log4j.Logger;
|
|
|
|
|
@@ -25,7 +26,7 @@ public class SynchedEntityData {
|
|
|
|
|
private static final Logger LOGGER = LogManager.getLogger();
|
|
|
|
|
private static final Map<Class<? extends Entity>, Integer> ENTITY_ID_POOL = Maps.newHashMap();
|
|
|
|
|
private final Entity entity;
|
|
|
|
|
- private final it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap<SynchedEntityData.DataItem<?>> entries = new it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap<>(); // Spigot - use better map // PAIL
|
|
|
|
|
+ private final Int2ObjectOpenHashMap<DataItem<?>> entries = new Int2ObjectOpenHashMap<>(); // Spigot - use better map // PAIL
|
|
|
|
|
// private final ReadWriteLock lock = new ReentrantReadWriteLock(); // Spigot - not required
|
|
|
|
|
private boolean isEmpty = true;
|
|
|
|
|
private boolean isDirty;
|
