2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Yive <admin@yive.me>
|
|
|
|
Date: Wed, 26 May 2021 15:09:33 -0700
|
|
|
|
Subject: [PATCH] Limit item frame cursors on maps
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2021-06-18 07:51:04 +02:00
|
|
|
index c94579d5db6802ef27c6c64cde1cdfdff5040ed2..05c1aa7c49134e099e3d14a244252173e6755401 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2021-06-17 10:37:27 +02:00
|
|
|
@@ -792,5 +792,10 @@ public class PaperWorldConfig {
|
2021-06-11 14:02:28 +02:00
|
|
|
private void allowUsingSignsInsideSpawnProtection() {
|
|
|
|
allowUsingSignsInsideSpawnProtection = getBoolean("allow-using-signs-inside-spawn-protection", allowUsingSignsInsideSpawnProtection);
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public int mapItemFrameCursorLimit = 128;
|
|
|
|
+ private void mapItemFrameCursorLimit() {
|
|
|
|
+ mapItemFrameCursorLimit = getInt("map-item-frame-cursor-limit", mapItemFrameCursorLimit);
|
|
|
|
+ }
|
|
|
|
}
|
2021-06-15 04:59:31 +02:00
|
|
|
|
2021-06-11 14:02:28 +02:00
|
|
|
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-06-17 06:00:32 +02:00
|
|
|
index 2e5155fe541ed7040a6be9fdec98b23e8c45bfb0..60d7496966b22e0553372a93e3c0e7ed9e166cba 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-06-16 06:12:06 +02:00
|
|
|
@@ -296,8 +296,12 @@ public class MapItemSavedData extends SavedData {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
MapFrame worldmapframe1 = new MapFrame(blockposition, entityitemframe.getDirection().get2DDataValue() * 90, entityitemframe.getId());
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ if (this.decorations.size() < player.level.paperConfig.mapItemFrameCursorLimit) {
|
|
|
|
this.addDecoration(MapDecoration.Type.FRAME, player.level, "frame-" + entityitemframe.getId(), (double) blockposition.getX(), (double) blockposition.getZ(), (double) (entityitemframe.getDirection().get2DDataValue() * 90), (Component) null);
|
|
|
|
this.frameMarkers.put(worldmapframe1.getId(), worldmapframe1);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
|
|
|
CompoundTag nbttagcompound = stack.getTag();
|