Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #243 from FatSaw/ver/1.12.2

Browse Source 
Some plugins cannot get passengers.
This commit is contained in:
josephworks
2023-03-20 21:48:00 -07:00
committed by GitHub
parent cff1a2d7fb 4d2519d0b0
commit b7527d1dba
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sources/src/main/java/net/minecraft/server/Entity.java
View File

@@ -45,10 +45,6 @@ import org.bukkit.event.entity.EntityPortalEvent;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
// CraftBukkit end // CraftBukkit end
// Dionysus start
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
// Dionysus end
/** /**
* Akarin Changes Note * Akarin Changes Note
* 1) Random -> LightRandom (performance) * 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 static int entityCount = 1; // Paper - MC-111480 - ID 0 is treated as special for DataWatchers, start 1
private int id; private int id;
public boolean i; public boolean blocksEntitySpawning() { return i; } // Paper - OBFHELPER public boolean i; public boolean blocksEntitySpawning() { return i; } // Paper - OBFHELPER
public final ObjectArrayList<Entity> passengers; // Dionysus public final List<Entity> passengers;
protected int j; protected int j;
private Entity au;public void setVehicle(Entity entity) { this.au = entity; } // Paper // OBFHELPER private Entity au;public void setVehicle(Entity entity) { this.au = entity; } // Paper // OBFHELPER
public boolean attachedToPlayer; public boolean attachedToPlayer;
@@ -209,7 +205,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper
public Entity(World world) { public Entity(World world) {
this.id = Entity.entityCount++; this.id = Entity.entityCount++;
this.passengers = new ObjectArrayList<>(); // Dionysus this.passengers = Lists.newArrayList();
this.boundingBox = Entity.c; this.boundingBox = Entity.c;
this.width = 0.6F; this.width = 0.6F;
this.length = 1.8F; this.length = 1.8F;
@@ -2885,7 +2881,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper
} }
public List<Entity> bF() { public List<Entity> 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) { public boolean w(Entity entity) {