mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 03:32:46 +01:00
e56bbcdcda
may help #284 Cleans up the lighting queue system, reducing diff and improving implementation. We no longer stop chunk unloads due to lighting updates, and instead simply flush the lighting queue. The cost of forcing the chunk (and its neighbors!) to stay loaded waiting for its lighting work to finish is much greater than simply taking the hit and doing the work. This change also helps reduce the diff and avoid bugs with missed diffs by removing duplicated logic. Also switches to a more effecient data structure (ArrayDeque instead of LinkedList) for the queue itself.
149 lines
7.4 KiB
Diff
149 lines
7.4 KiB
Diff
From d0e77b7d023cdba51d177126f4592d26da939ee1 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Fri, 29 Apr 2016 20:02:00 -0400
|
|
Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
|
|
|
|
Maps used a modified version of rendering to support plugin controlled
|
|
imaging on maps. The Craft Map Renderer is much slower than Vanilla,
|
|
causing maps in item frames to cause a noticeable hit on server performance.
|
|
|
|
This updates the map system to not use the Craft system if we detect that no
|
|
custom renderers are in use, defaulting to the much simpler Vanilla system.
|
|
|
|
Additionally, numerous issues to player position tracking on maps has been fixed.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
index 0f73fcf..696f21f 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
@@ -589,6 +589,12 @@ public abstract class EntityHuman extends EntityLiving {
|
|
return null;
|
|
}
|
|
// CraftBukkit end
|
|
+ // Paper start - remove player from map on drop
|
|
+ if (itemstack.getItem() == Items.FILLED_MAP) {
|
|
+ WorldMap worldmap = Items.FILLED_MAP.getSavedMap(itemstack, this.world);
|
|
+ worldmap.updateSeenPlayers(this, itemstack);
|
|
+ }
|
|
+ // Paper stop
|
|
|
|
ItemStack itemstack1 = this.a(entityitem);
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
|
index 6c8da79..38e88d8 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
|
@@ -90,11 +90,11 @@ public class EntityTrackerEntry {
|
|
}
|
|
|
|
// PAIL : rename
|
|
- if (this.tracker instanceof EntityItemFrame /*&& this.a % 10 == 0*/) { // CraftBukkit - Moved below, should always enter this block
|
|
+ if (this.tracker instanceof EntityItemFrame && this.a % 20 == 0) { // Paper
|
|
EntityItemFrame entityitemframe = (EntityItemFrame) this.tracker;
|
|
ItemStack itemstack = entityitemframe.getItem();
|
|
|
|
- if (this.a % 10 == 0 && itemstack != null && itemstack.getItem() instanceof ItemWorldMap) { // CraftBukkit - Moved this.m % 10 logic here so item frames do not enter the other blocks
|
|
+ if (itemstack != null && itemstack.getItem() instanceof ItemWorldMap) { // Paper - moved back up
|
|
WorldMap worldmap = Items.FILLED_MAP.getSavedMap(itemstack, this.tracker.world);
|
|
Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
|
index 5c3e075..0f1ee49 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -1144,6 +1144,7 @@ public abstract class World implements IBlockAccess {
|
|
{
|
|
if ( iter.next().trackee == entity )
|
|
{
|
|
+ map.decorations.remove(entity.getUniqueID()); // Paper
|
|
iter.remove();
|
|
}
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java
|
|
index 7f604ca..e3e56f3 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldMap.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldMap.java
|
|
@@ -27,6 +27,7 @@ public class WorldMap extends PersistentBase {
|
|
public List<WorldMap.WorldMapHumanTracker> h = Lists.newArrayList();
|
|
public Map<EntityHuman, WorldMap.WorldMapHumanTracker> j = Maps.newHashMap(); // Spigot
|
|
public Map<UUID, MapIcon> decorations = Maps.newLinkedHashMap(); // Spigot
|
|
+ private org.bukkit.craftbukkit.map.RenderData vanillaRender = new org.bukkit.craftbukkit.map.RenderData(); // Paper
|
|
|
|
// CraftBukkit start
|
|
public final CraftMapView mapView;
|
|
@@ -39,6 +40,7 @@ public class WorldMap extends PersistentBase {
|
|
// CraftBukkit start
|
|
mapView = new CraftMapView(this);
|
|
server = (CraftServer) org.bukkit.Bukkit.getServer();
|
|
+ vanillaRender.buffer = colors; // Paper
|
|
// CraftBukkit end
|
|
}
|
|
|
|
@@ -112,6 +114,7 @@ public class WorldMap extends PersistentBase {
|
|
}
|
|
}
|
|
}
|
|
+ vanillaRender.buffer = colors; // Paper
|
|
|
|
}
|
|
|
|
@@ -146,6 +149,7 @@ public class WorldMap extends PersistentBase {
|
|
return nbttagcompound;
|
|
}
|
|
|
|
+ public void updateSeenPlayers(EntityHuman entityhuman, ItemStack itemstack) { a(entityhuman, itemstack); } // Paper // OBFHELPER
|
|
public void a(EntityHuman entityhuman, ItemStack itemstack) {
|
|
if (!this.j.containsKey(entityhuman)) {
|
|
WorldMap.WorldMapHumanTracker worldmap_worldmaphumantracker = new WorldMap.WorldMapHumanTracker(entityhuman);
|
|
@@ -273,6 +277,21 @@ public class WorldMap extends PersistentBase {
|
|
|
|
public class WorldMapHumanTracker {
|
|
|
|
+ // Paper start
|
|
+ private void addSeenPlayers(java.util.Collection<MapIcon> icons) {
|
|
+ org.bukkit.entity.Player player = (org.bukkit.entity.Player) trackee.getBukkitEntity();
|
|
+ WorldMap.this.decorations.forEach((uuid, mapIcon) -> {
|
|
+ // If this cursor is for a player check visibility with vanish system
|
|
+ org.bukkit.entity.Player other = org.bukkit.Bukkit.getPlayer(uuid); // Spigot
|
|
+ if (other == null || player.canSee(other)) {
|
|
+ icons.add(mapIcon);
|
|
+ }
|
|
+ });
|
|
+ }
|
|
+ private boolean shouldUseVanillaMap() {
|
|
+ return mapView.getRenderers().size() == 1 && mapView.getRenderers().get(0).getClass() == org.bukkit.craftbukkit.map.CraftMapRenderer.class;
|
|
+ }
|
|
+ // Paper stop
|
|
public final EntityHuman trackee;
|
|
private boolean d = true;
|
|
private int e = 0;
|
|
@@ -288,9 +307,12 @@ public class WorldMap extends PersistentBase {
|
|
|
|
public Packet<?> a(ItemStack itemstack) {
|
|
// CraftBukkit start
|
|
- org.bukkit.craftbukkit.map.RenderData render = WorldMap.this.mapView.render((org.bukkit.craftbukkit.entity.CraftPlayer) this.trackee.getBukkitEntity()); // CraftBukkit
|
|
+ if (!this.d && this.i % 5 != 0) { this.i++; return null; } // Paper - this won't end up sending, so don't render it!
|
|
+ boolean vanillaMaps = shouldUseVanillaMap(); // Paper
|
|
+ org.bukkit.craftbukkit.map.RenderData render = !vanillaMaps ? WorldMap.this.mapView.render((org.bukkit.craftbukkit.entity.CraftPlayer) this.trackee.getBukkitEntity()) : WorldMap.this.vanillaRender; // CraftBukkit // Paper
|
|
|
|
java.util.Collection<MapIcon> icons = new java.util.ArrayList<MapIcon>();
|
|
+ if (vanillaMaps) addSeenPlayers(icons); // Paper
|
|
|
|
for ( org.bukkit.map.MapCursor cursor : render.cursors) {
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
|
|
index 256a131..5768cd5 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
|
|
@@ -5,7 +5,7 @@ import org.bukkit.map.MapCursor;
|
|
|
|
public class RenderData {
|
|
|
|
- public final byte[] buffer;
|
|
+ public byte[] buffer; // Paper
|
|
public final ArrayList<MapCursor> cursors;
|
|
|
|
public RenderData() {
|
|
--
|
|
2.8.2
|
|
|