From 47e8f5dae41b6f179c3248d3697be30bbaadc1b5 Mon Sep 17 00:00:00 2001 From: FatSaw Date: Tue, 21 Mar 2023 03:46:07 +0200 Subject: [PATCH] Revert "Use fastutil for passengers" This reverts commit 947b22892c8f58e538f42a474b18ee1ca6ee7932. --- sources/src/main/java/net/minecraft/server/Entity.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sources/src/main/java/net/minecraft/server/Entity.java b/sources/src/main/java/net/minecraft/server/Entity.java index 5591fc33d..935944b9f 100644 --- a/sources/src/main/java/net/minecraft/server/Entity.java +++ b/sources/src/main/java/net/minecraft/server/Entity.java @@ -45,10 +45,6 @@ import org.bukkit.event.entity.EntityPortalEvent; import org.bukkit.plugin.PluginManager; // CraftBukkit end -// Dionysus start -import it.unimi.dsi.fastutil.objects.ObjectArrayList; -// Dionysus end - /** * Akarin Changes Note * 1) Random -> LightRandom (performance) @@ -95,7 +91,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper private static int entityCount = 1; // Paper - MC-111480 - ID 0 is treated as special for DataWatchers, start 1 private int id; public boolean i; public boolean blocksEntitySpawning() { return i; } // Paper - OBFHELPER - public final ObjectArrayList passengers; // Dionysus + public final List passengers; protected int j; private Entity au;public void setVehicle(Entity entity) { this.au = entity; } // Paper // OBFHELPER public boolean attachedToPlayer; @@ -209,7 +205,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper public Entity(World world) { this.id = Entity.entityCount++; - this.passengers = new ObjectArrayList<>(); // Dionysus + this.passengers = Lists.newArrayList(); this.boundingBox = Entity.c; this.width = 0.6F; this.length = 1.8F; @@ -2885,7 +2881,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper } public List bF() { - return (List) (this.passengers.isEmpty() ? Collections.emptyList() : new ObjectArrayList<>(this.passengers)); // Dionysus + return (List) (this.passengers.isEmpty() ? Collections.emptyList() : Lists.newArrayList(this.passengers)); } public boolean w(Entity entity) {