mirror of https://github.com/YatopiaMC/Yatopia.git
Don't unnecessarily copy the passenger list
This commit is contained in:
parent
5c8274bd2f
commit
27a7dc2193
|
@ -58,6 +58,7 @@ This is an overview over all patches that are currently used.
|
|||
| server | Do not update distance map when animal and mob spawning is | Beech Horn | |
|
||||
| server | Don't load chunk with seed based feature search | Phoenix616 | |
|
||||
| server | Don't trigger Lootable Refresh for non player interaction | Aikar | |
|
||||
| server | Don't unnecessarily copy the passenger list | Ivan Pekov | |
|
||||
| server | Don't wake up entities when damage event is cancelled | Phoenix616 | |
|
||||
| server | Dont send useless entity packets | William Blake Galbreath | |
|
||||
| server | Ensure pools create daemon threads | Ivan Pekov | |
|
||||
|
|
|
@ -0,0 +1,37 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Ivan Pekov <ivan@mrivanplays.com>
|
||||
Date: Wed, 23 Dec 2020 09:55:43 +0200
|
||||
Subject: [PATCH] Don't unnecessarily copy the passenger list
|
||||
|
||||
It is only copied if it's needed, and that is in EntityTrackerEntry, when we've detected a change.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 2bacecb9cee2f93b142d63b9a79641d7bac8f868..8ba05d0dadf34baa046962cbff71a2fcfd1471d7 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -3284,7 +3284,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
}
|
||||
|
||||
public List<Entity> getPassengers() {
|
||||
+ // Yatopia start - don't copy passengers list
|
||||
+ /*
|
||||
return (List) (this.passengers.isEmpty() ? Collections.emptyList() : Lists.newArrayList(this.passengers));
|
||||
+ */
|
||||
+ return this.passengers.isEmpty() ? Collections.emptyList() : this.passengers;
|
||||
+ // Yatopia end
|
||||
}
|
||||
|
||||
public boolean w(Entity entity) {
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
||||
index 228236bce14bfdf930570b453862dcfaae9e4823..0be11d1263d84b270c25ec8249832164dc75409d 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
||||
@@ -78,7 +78,7 @@ public class EntityTrackerEntry {
|
||||
List<Entity> list = this.tracker.getPassengers();
|
||||
|
||||
if (!list.equals(this.p)) {
|
||||
- this.p = list;
|
||||
+ this.p = com.google.common.collect.ImmutableList.copyOf(list); // Yatopia - only copy list if something has changed
|
||||
this.broadcastIncludingSelf(new PacketPlayOutMount(this.tracker)); // CraftBukkit
|
||||
}
|
||||
|
Loading…
Reference in New Issue