mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-05 10:20:53 +01:00
976c6d425b
A recent commit has been made that caused patches to be out of order, rebuilding
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/network/syncher/DataWatcher.java b/src/main/java/net/minecraft/network/syncher/DataWatcher.java
|
|
index 3cdae5409989ea4bad8311b0083517b7815caae1..bb09b7be91b488ebc336b2b6f5deafc0ccab27a4 100644
|
|
--- a/src/main/java/net/minecraft/network/syncher/DataWatcher.java
|
|
+++ b/src/main/java/net/minecraft/network/syncher/DataWatcher.java
|
|
@@ -17,6 +17,7 @@ import net.minecraft.CrashReportSystemDetails;
|
|
import net.minecraft.ReportedException;
|
|
import net.minecraft.network.PacketDataSerializer;
|
|
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;
|
|
@@ -26,7 +27,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;
|