From 0adc1b9989216c97b36642780d777a6adb63d20c Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 15 Oct 2018 19:21:35 +1100
Subject: [PATCH] SPIGOT-4428: Update Player CustomName

---
 nms-patches/DataConverterRegistry.patch | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 nms-patches/DataConverterRegistry.patch

diff --git a/nms-patches/DataConverterRegistry.patch b/nms-patches/DataConverterRegistry.patch
new file mode 100644
index 0000000000..b2981bc249
--- /dev/null
+++ b/nms-patches/DataConverterRegistry.patch
@@ -0,0 +1,21 @@
+--- a/net/minecraft/server/DataConverterRegistry.java
++++ b/net/minecraft/server/DataConverterRegistry.java
+@@ -195,6 +195,18 @@
+         datafixerbuilder.addFixer(new DataConverterItemFrame(schema46, false));
+         Schema schema47 = datafixerbuilder.addSchema(1458, DataConverterRegistry.c);
+ 
++        // CraftBukkit start
++        datafixerbuilder.addFixer(new com.mojang.datafixers.DataFix(schema47, false) {
++            @Override
++            protected com.mojang.datafixers.TypeRewriteRule makeRule() {
++                return this.fixTypeEverywhereTyped("Player CustomName", this.getInputSchema().getType(DataConverterTypes.b), (typed) -> {
++                    return typed.update(DSL.remainderFinder(), (dynamic) -> {
++                        return DataConverterCustomNameEntity.a(dynamic);
++                    });
++                });
++            }
++        });
++        // CraftBukkit end
+         datafixerbuilder.addFixer(new DataConverterCustomNameEntity(schema47, false));
+         datafixerbuilder.addFixer(new DataConverterCustomNameItem(schema47, false));
+         datafixerbuilder.addFixer(new DataConverterCustomNameTile(schema47, false));