From 2798adaeb1f44d632a9e7755ded8fc740b95e9cd Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Tue, 6 Apr 2021 12:53:34 +0200
Subject: [PATCH] entities: fix player merging

---
 .../pixlyzer/generator/generators/EntityGenerator.kt        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/EntityGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/EntityGenerator.kt
index fd0af62..ca21fba 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/EntityGenerator.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/EntityGenerator.kt
@@ -120,9 +120,9 @@ object EntityGenerator : Generator(
                 }
             }
             mergePlayerDate("RemotePlayer")
-            mergePlayerDate("AbstractClientPlayer")
-            mergePlayerDate("Player")
-            playerJson.addProperty("class", "Player")
+            mergePlayerDate("AbstractClientPlayerEntity")
+            mergePlayerDate("PlayerEntity")
+            playerJson.addProperty("class", "PlayerEntity")
         }
     }