Remove 'Normalize spaces on when reading a chat packet' as it was fixed upstream
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
28
CraftBukkit-Patches/0131-Convert-Horses-owner-to-UUID.patch
Normal file
28
CraftBukkit-Patches/0131-Convert-Horses-owner-to-UUID.patch
Normal file
@@ -0,0 +1,28 @@
|
||||
From ecd3b9da7c4b9813bfe22dbbca61acbb5a17c83f Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 16 Apr 2014 01:40:30 -0400
|
||||
Subject: [PATCH] Convert Horses owner to UUID
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
|
||||
index 7d67210..6104597 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHorse.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
|
||||
@@ -1001,6 +1001,14 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener {
|
||||
if (nbttagcompound.hasKeyOfType("OwnerUUID", 8)) {
|
||||
this.setOwnerUUID(nbttagcompound.getString("OwnerUUID"));
|
||||
}
|
||||
+ // Spigot start
|
||||
+ else if (nbttagcompound.hasKey("OwnerName")) {
|
||||
+ String owner = nbttagcompound.getString("OwnerName");
|
||||
+ if (owner != null && !owner.isEmpty()) {
|
||||
+ this.setOwnerUUID(NameReferencingFileConverter.a(owner));
|
||||
+ }
|
||||
+ }
|
||||
+ // Spigot end
|
||||
// CraftBukkit start
|
||||
if (nbttagcompound.hasKey("Bukkit.MaxDomestication")) {
|
||||
this.maxDomestication = nbttagcompound.getInt("Bukkit.MaxDomestication");
|
||||
--
|
||||
1.9.1
|
||||
|
||||
Reference in New Issue
Block a user