mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 16:50:17 +01:00
ffb572ce9a
Spigot has patched this issue inside MapIcon, meaning that we no longer need to maintain this patch; Spigots patch also fixes #668 in that it will verify the length of the array, as well as protect against a negative type value being fetched from the array. Only real change is that Spigots patch returns a MapIcon.Type.PLAYER, instead of the RED_MARKER as originally PR'd by Aikar.
22 lines
1.2 KiB
Diff
22 lines
1.2 KiB
Diff
From 8cbb563ef82d04f6723b7d3cfc4363da1d833249 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Mon, 2 Jan 2017 02:43:22 -0500
|
|
Subject: [PATCH] MC-112017: Allow 31 instead of 30 for item names
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
index cbe5d36d..70af4ebb 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -2448,7 +2448,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
|
if (packetplayincustompayload.b() != null && packetplayincustompayload.b().readableBytes() >= 1) {
|
|
String s4 = SharedConstants.a(packetplayincustompayload.b().e(32767));
|
|
|
|
- if (s4.length() <= 30) {
|
|
+ if (s4.length() <= 31) { // Paper - MC-112017
|
|
if (!s4.isEmpty() || containeranvil.getSlot(2).getItem().isEmpty()) containeranvil.a(s4); // Paper - Hack Fix for MC-111699
|
|
}
|
|
} else {
|
|
--
|
|
2.12.2
|
|
|