OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-08 03:22:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-6308: Deprecate the location name property of map items

Browse source 
This property does not have the expected effect.

By: blablubbabc <lukas@wirsindwir.de>
This commit is contained in:
CraftBukkit/Spigot 2023-04-17 19:33:17 +10:00
parent 9e30ea471f
commit 2ffb1d2479
1 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java
View file

@ -18,6 +18,7 @@ import org.bukkit.map.MapView;
@DelegateDeserialization(SerializableMeta.class) @DelegateDeserialization(SerializableMeta.class)
class CraftMetaMap extends CraftMetaItem implements MapMeta { class CraftMetaMap extends CraftMetaItem implements MapMeta {
static final ItemMetaKey MAP_SCALING = new ItemMetaKey("map_is_scaling", "scaling"); static final ItemMetaKey MAP_SCALING = new ItemMetaKey("map_is_scaling", "scaling");
@Deprecated // SPIGOT-6308
static final ItemMetaKey MAP_LOC_NAME = new ItemMetaKey("LocName", "display-loc-name"); static final ItemMetaKey MAP_LOC_NAME = new ItemMetaKey("LocName", "display-loc-name");
static final ItemMetaKey MAP_COLOR = new ItemMetaKey("MapColor", "display-map-color"); static final ItemMetaKey MAP_COLOR = new ItemMetaKey("MapColor", "display-map-color");
static final ItemMetaKey MAP_ID = new ItemMetaKey("map", "map-id"); static final ItemMetaKey MAP_ID = new ItemMetaKey("map", "map-id");
@ -27,7 +28,6 @@ class CraftMetaMap extends CraftMetaItem implements MapMeta {
private Integer mapId; private Integer mapId;
private byte scaling = SCALING_EMPTY; private byte scaling = SCALING_EMPTY;
private String locName;
private Color color; private Color color;
CraftMetaMap(CraftMetaItem meta) { CraftMetaMap(CraftMetaItem meta) {
@ -40,7 +40,6 @@ class CraftMetaMap extends CraftMetaItem implements MapMeta {
CraftMetaMap map = (CraftMetaMap) meta; CraftMetaMap map = (CraftMetaMap) meta;
this.mapId = map.mapId; this.mapId = map.mapId;
this.scaling = map.scaling; this.scaling = map.scaling;
this.locName = map.locName;
this.color = map.color; this.color = map.color;
} }
@ -58,10 +57,6 @@ class CraftMetaMap extends CraftMetaItem implements MapMeta {
if (tag.contains(DISPLAY.NBT)) { if (tag.contains(DISPLAY.NBT)) {
NBTTagCompound display = tag.getCompound(DISPLAY.NBT); NBTTagCompound display = tag.getCompound(DISPLAY.NBT);
if (display.contains(MAP_LOC_NAME.NBT)) {
locName = display.getString(MAP_LOC_NAME.NBT);
}
if (display.contains(MAP_COLOR.NBT)) { if (display.contains(MAP_COLOR.NBT)) {
try { try {
color = Color.fromRGB(display.getInt(MAP_COLOR.NBT)); color = Color.fromRGB(display.getInt(MAP_COLOR.NBT));
@ -178,17 +173,17 @@ class CraftMetaMap extends CraftMetaItem implements MapMeta {
@Override @Override
public boolean hasLocationName() { public boolean hasLocationName() {
return this.locName != null; return this.hasLocalizedName(); // SPIGOT-6308
} }
@Override @Override
public String getLocationName() { public String getLocationName() {
return this.locName; return this.getLocalizedName(); // SPIGOT-6308
} }
@Override @Override
public void setLocationName(String name) { public void setLocationName(String name) {
this.locName = name; this.setLocalizedName(name); // SPIGOT-6308
} }
@Override @Override
@ -216,7 +211,6 @@ class CraftMetaMap extends CraftMetaItem implements MapMeta {
return (this.scaling == that.scaling) return (this.scaling == that.scaling)
&& (hasMapId() ? that.hasMapId() && this.mapId.equals(that.mapId) : !that.hasMapId()) && (hasMapId() ? that.hasMapId() && this.mapId.equals(that.mapId) : !that.hasMapId())
&& (hasLocationName() ? that.hasLocationName() && this.locName.equals(that.locName) : !that.hasLocationName())
&& (hasColor() ? that.hasColor() && this.color.equals(that.color) : !that.hasColor()); && (hasColor() ? that.hasColor() && this.color.equals(that.color) : !that.hasColor());
} }
return true; return true;
@ -238,9 +232,6 @@ class CraftMetaMap extends CraftMetaItem implements MapMeta {
if (hasScaling()) { if (hasScaling()) {
hash ^= 0x22222222 << (isScaling() ? 1 : -1); hash ^= 0x22222222 << (isScaling() ? 1 : -1);
} }
if (hasLocationName()) {
hash = 61 * hash + locName.hashCode();
}
if (hasColor()) { if (hasColor()) {
hash = 61 * hash + color.hashCode(); hash = 61 * hash + color.hashCode();
} }
@ -266,10 +257,6 @@ class CraftMetaMap extends CraftMetaItem implements MapMeta {
builder.put(MAP_SCALING.BUKKIT, isScaling()); builder.put(MAP_SCALING.BUKKIT, isScaling());
} }
if (hasLocationName()) {
builder.put(MAP_LOC_NAME.BUKKIT, getLocationName());
}
if (hasColor()) { if (hasColor()) {
builder.put(MAP_COLOR.BUKKIT, getColor()); builder.put(MAP_COLOR.BUKKIT, getColor());
} }