PaperMC/patches/server/0091-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch

145 lines
7.7 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 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/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 8c5133defa9d3166cf987a6f1d02f02f0515746d..41b4cc7577b937e22512df00e3d4a3445fa7d004 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2013,6 +2013,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
2021-06-11 14:02:28 +02:00
{
2021-06-12 06:38:04 +02:00
if ( iter.next().player == entity )
{
+ map.decorations.remove(entity.getName().getString()); // Paper
iter.remove();
}
2021-06-11 14:02:28 +02:00
}
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
2021-11-23 14:22:49 +01:00
index 5d37c82bd5cd20aa2d452f0214f3303768e36a3d..6cf50fbfdeee38f8835ad8dd6ec6d16416174067 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
2021-11-23 14:22:49 +01:00
@@ -87,6 +87,7 @@ import net.minecraft.world.item.ElytraItem;
2021-06-11 14:02:28 +02:00
import net.minecraft.world.item.ItemCooldowns;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
2021-06-12 06:38:04 +02:00
+import net.minecraft.world.item.MapItem; // Paper
2021-06-11 14:02:28 +02:00
import net.minecraft.world.item.ProjectileWeaponItem;
import net.minecraft.world.item.SwordItem;
import net.minecraft.world.item.crafting.Recipe;
2021-11-23 14:22:49 +01:00
@@ -105,6 +106,7 @@ import net.minecraft.world.level.block.entity.SignBlockEntity;
2021-06-11 14:02:28 +02:00
import net.minecraft.world.level.block.entity.StructureBlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.pattern.BlockInWorld;
2021-06-12 06:38:04 +02:00
+import net.minecraft.world.level.saveddata.maps.MapItemSavedData; // Paper
2021-06-11 14:02:28 +02:00
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;
import net.minecraft.world.scores.PlayerTeam;
2021-11-23 14:22:49 +01:00
@@ -730,6 +732,14 @@ public abstract class Player extends LivingEntity {
2021-06-11 14:02:28 +02:00
return null;
}
// CraftBukkit end
+ // Paper start - remove player from map on drop
+ if (stack.getItem() == Items.FILLED_MAP) {
2021-06-12 06:38:04 +02:00
+ MapItemSavedData worldmap = MapItem.getSavedData(stack, this.level);
+ if (worldmap != null) {
+ worldmap.tickCarriedBy(this, stack);
+ }
2021-06-11 14:02:28 +02:00
+ }
+ // Paper end
return entityitem;
}
diff --git a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
2021-11-23 14:22:49 +01:00
index 3b35ec1df648a3de920ea0c15962388044737bbc..a6219dd70ab76959b2aaa155d5d17acc22095753 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
+++ b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
2021-11-23 14:22:49 +01:00
@@ -63,6 +63,7 @@ public class MapItemSavedData extends SavedData {
2021-06-11 14:02:28 +02:00
public final Map<String, MapDecoration> decorations = Maps.newLinkedHashMap();
private final Map<String, MapFrame> frameMarkers = Maps.newHashMap();
2021-06-12 06:38:04 +02:00
private int trackedDecorationCount;
2021-06-11 14:02:28 +02:00
+ private org.bukkit.craftbukkit.map.RenderData vanillaRender = new org.bukkit.craftbukkit.map.RenderData(); // Paper
// CraftBukkit start
public final CraftMapView mapView;
2021-11-23 14:22:49 +01:00
@@ -83,6 +84,7 @@ public class MapItemSavedData extends SavedData {
2021-06-11 14:02:28 +02:00
// CraftBukkit start
2021-06-12 06:38:04 +02:00
this.mapView = new CraftMapView(this);
this.server = (CraftServer) org.bukkit.Bukkit.getServer();
+ this.vanillaRender.buffer = colors; // Paper
2021-06-11 14:02:28 +02:00
// CraftBukkit end
}
2021-11-23 14:22:49 +01:00
@@ -138,6 +140,7 @@ public class MapItemSavedData extends SavedData {
2021-06-12 06:38:04 +02:00
if (abyte.length == 16384) {
worldmap.colors = abyte;
2021-06-11 14:02:28 +02:00
}
2021-06-12 06:38:04 +02:00
+ worldmap.vanillaRender.buffer = abyte; // Paper
2021-06-11 14:02:28 +02:00
2021-06-12 06:38:04 +02:00
ListTag nbttaglist = nbt.getList("banners", 10);
2021-06-11 14:02:28 +02:00
2021-11-23 14:22:49 +01:00
@@ -548,6 +551,21 @@ public class MapItemSavedData extends SavedData {
2021-06-11 14:02:28 +02:00
public class HoldingPlayer {
+ // Paper start
+ private void addSeenPlayers(java.util.Collection<MapDecoration> icons) {
2021-06-12 06:38:04 +02:00
+ org.bukkit.entity.Player player = (org.bukkit.entity.Player) this.player.getBukkitEntity();
2021-06-11 14:02:28 +02:00
+ MapItemSavedData.this.decorations.forEach((name, mapIcon) -> {
+ // If this cursor is for a player check visibility with vanish system
+ org.bukkit.entity.Player other = org.bukkit.Bukkit.getPlayerExact(name); // 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 end
public final Player player;
private boolean dirtyData = true;
private int minDirtyX;
2021-11-23 14:22:49 +01:00
@@ -581,7 +599,9 @@ public class MapItemSavedData extends SavedData {
2021-06-11 14:02:28 +02:00
@Nullable
2021-06-12 06:38:04 +02:00
Packet<?> nextUpdatePacket(int mapId) {
MapItemSavedData.MapPatch worldmap_b;
2021-06-11 14:02:28 +02:00
- org.bukkit.craftbukkit.map.RenderData render = MapItemSavedData.this.mapView.render((org.bukkit.craftbukkit.entity.CraftPlayer) this.player.getBukkitEntity()); // CraftBukkit
+ if (!this.dirtyData && this.tick % 5 != 0) { this.tick++; 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 ? MapItemSavedData.this.mapView.render((org.bukkit.craftbukkit.entity.CraftPlayer) this.player.getBukkitEntity()) : MapItemSavedData.this.vanillaRender; // CraftBukkit // Paper
2021-06-12 06:38:04 +02:00
if (this.dirtyData) {
this.dirtyData = false;
2021-11-23 14:22:49 +01:00
@@ -597,6 +617,8 @@ public class MapItemSavedData extends SavedData {
2021-06-12 06:38:04 +02:00
// CraftBukkit start
java.util.Collection<MapDecoration> icons = new java.util.ArrayList<MapDecoration>();
2021-06-11 14:02:28 +02:00
2021-06-12 06:38:04 +02:00
+ if (vanillaMaps) addSeenPlayers(icons); // Paper
+
for (org.bukkit.map.MapCursor cursor : render.cursors) {
if (cursor.isVisible()) {
icons.add(new MapDecoration(MapDecoration.Type.byIcon(cursor.getRawType()), cursor.getX(), cursor.getY(), cursor.getDirection(), PaperAdventure.asVanilla(cursor.caption()))); // Paper - Adventure
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
index 256a131781721c86dd6cdbc329335964570cbe8c..5768cd512ec166f1e8d1f4a28792015347297c3f 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() {