mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 04:55:47 +01:00
18c3716c49
This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
104 lines
4.0 KiB
Diff
104 lines
4.0 KiB
Diff
From 2c29fda252395dc3caf19e77deea3ef876473ace Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Mon, 17 Jun 2013 01:24:00 -0400
|
|
Subject: [PATCH] Entity Tracking Improvements
|
|
|
|
If any part of a Vehicle/Passenger relationship is visible to a player,
|
|
send all passenger/vehicles to the player in the chain.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
|
index d1f07bbbd..945f06c93 100644
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
|
@@ -53,6 +53,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper
|
|
|
|
protected CraftEntity bukkitEntity;
|
|
|
|
+ EntityTrackerEntry tracker; // Paper
|
|
public CraftEntity getBukkitEntity() {
|
|
if (bukkitEntity == null) {
|
|
bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
|
|
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
|
index 759dacba7..efc4c79ab 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
|
@@ -49,6 +49,7 @@ public class EntityTrackerEntry {
|
|
// Paper end
|
|
|
|
public EntityTrackerEntry(Entity entity, int i, int j, int k, boolean flag) {
|
|
+ entity.tracker = this; // Paper
|
|
this.tracker = entity;
|
|
this.e = i;
|
|
this.f = j;
|
|
@@ -446,17 +447,59 @@ public class EntityTrackerEntry {
|
|
|
|
this.tracker.b(entityplayer);
|
|
entityplayer.d(this.tracker);
|
|
+ updatePassengers(entityplayer); // Paper
|
|
}
|
|
} else if (this.trackedPlayers.contains(entityplayer)) {
|
|
this.trackedPlayers.remove(entityplayer);
|
|
this.tracker.c(entityplayer);
|
|
entityplayer.c(this.tracker);
|
|
+ updatePassengers(entityplayer); // Paper
|
|
}
|
|
|
|
}
|
|
}
|
|
|
|
public boolean c(EntityPlayer entityplayer) {
|
|
+ // Paper start
|
|
+ if (tracker.isPassenger()) {
|
|
+ return isTrackedBy(tracker.getVehicle(), entityplayer);
|
|
+ } else if (hasPassengerInRange(tracker, entityplayer)) {
|
|
+ return true;
|
|
+ }
|
|
+
|
|
+ return isInRangeOfPlayer(entityplayer);
|
|
+ }
|
|
+ private static boolean hasPassengerInRange(Entity entity, EntityPlayer entityplayer) {
|
|
+ if (!entity.isVehicle()) {
|
|
+ return false;
|
|
+ }
|
|
+ for (Entity passenger : entity.passengers) {
|
|
+ if (passenger.tracker != null && passenger.tracker.isInRangeOfPlayer(entityplayer)) {
|
|
+ return true;
|
|
+ }
|
|
+ if (passenger.isVehicle()) {
|
|
+ if (hasPassengerInRange(passenger, entityplayer)) {
|
|
+ return true;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ return false;
|
|
+ }
|
|
+ private static boolean isTrackedBy(Entity entity, EntityPlayer entityplayer) {
|
|
+ return entity == entityplayer || entity.tracker != null && entity.tracker.trackedPlayers.contains(entityplayer);
|
|
+ }
|
|
+ private void updatePassengers(EntityPlayer player) {
|
|
+ if (tracker.isVehicle()) {
|
|
+ tracker.passengers.forEach((e) -> {
|
|
+ if (e.tracker != null) {
|
|
+ e.tracker.updatePlayer(player);
|
|
+ }
|
|
+ });
|
|
+ player.playerConnection.sendPacket(new PacketPlayOutMount(this.tracker));
|
|
+ }
|
|
+ }
|
|
+ private boolean isInRangeOfPlayer(EntityPlayer entityplayer) {
|
|
+ // Paper end
|
|
double d0 = entityplayer.locX - (double) this.xLoc / 4096.0D;
|
|
double d1 = entityplayer.locZ - (double) this.zLoc / 4096.0D;
|
|
int i = Math.min(this.e, this.f);
|
|
@@ -593,6 +636,7 @@ public class EntityTrackerEntry {
|
|
this.trackedPlayers.remove(entityplayer);
|
|
this.tracker.c(entityplayer);
|
|
entityplayer.c(this.tracker);
|
|
+ updatePassengers(entityplayer); // Paper
|
|
}
|
|
|
|
}
|
|
--
|
|
2.18.0
|
|
|