28 lines
1.6 KiB
Diff
28 lines
1.6 KiB
Diff
|
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
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java
|
||
|
|
index be8e705fc3f2c31e4f84f59c977488d8ecd9cae1..e69093b411f76ea4090789576f8fb6635bd02ca5 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/DataWatcher.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/DataWatcher.java
|
||
|
|
@@ -12,6 +12,7 @@ import java.util.Map;
|
||
|
|
import java.util.concurrent.locks.ReadWriteLock;
|
||
|
|
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
||
|
|
import javax.annotation.Nullable;
|
||
|
|
+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;
|
||
|
|
@@ -21,7 +22,7 @@ public class DataWatcher {
|
||
|
|
private static final Logger LOGGER = LogManager.getLogger();
|
||
|
|
private static final Map<Class<? extends Entity>, Integer> b = Maps.newHashMap();
|
||
|
|
private final Entity entity;
|
||
|
|
- private final it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap<DataWatcher.Item<?>> entries = new it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap<>(); // Spigot - use better map // PAIL
|
||
|
|
+ private final Int2ObjectOpenHashMap<Item<?>> entries = new Int2ObjectOpenHashMap<>(); // Spigot - use better map // PAIL
|
||
|
|
// private final ReadWriteLock lock = new ReentrantReadWriteLock(); // Spigot - not required
|
||
|
|
private boolean f = true;
|
||
|
|
private boolean g;
|