core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore invalid Marker Icon ID's in maps - Fixes #497 

Replace with the red marker. Should of only happened by creative abuse.
This commit is contained in:
Aikar 2016-12-19 23:39:52 -05:00
parent a9f87fd8fe
commit 2c0075031c
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Spigot-Server-Patches/0187-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch Normal file
View File

@ -0,0 +1,27 @@
From 3a254afb4fdeca00e5807e50eea6384e76969546 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 19 Dec 2016 23:38:57 -0500
Subject: [PATCH] Ignore invalid Marker Icon ID's in maps
Replace with the red marker. Should of only happened by creative abuse.
diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java
index dbe6a80f2..dfd8e4d84 100644
--- a/src/main/java/net/minecraft/server/WorldMap.java
+++ b/src/main/java/net/minecraft/server/WorldMap.java
@@ -194,7 +194,11 @@ public class WorldMap extends PersistentBase {
// Spigot - start
UUID uuid = UUID.nameUUIDFromBytes(nbttagcompound.getString("id").getBytes(Charsets.US_ASCII));
if (!this.decorations.containsKey(uuid)) {
- this.a(MapIcon.Type.a(nbttagcompound.getByte("type")), entityhuman.world, uuid, nbttagcompound.getDouble("x"), nbttagcompound.getDouble("z"), nbttagcompound.getDouble("rot"));
+ // Paper start - protect against bad map icon indexes
+ byte iconId = nbttagcompound.getByte("type");
+ MapIcon.Type[] values = MapIcon.Type.values();
+ this.a(values.length > iconId ? values[iconId] : values[2], entityhuman.world, uuid, nbttagcompound.getDouble("x"), nbttagcompound.getDouble("z"), nbttagcompound.getDouble("rot"));
+ // Paper end
// Spigot - end
}
}
--
2.11.0