From dd892bb6c8ae913021b4caa2b9e3caea3b8c10bb Mon Sep 17 00:00:00 2001
From: 2xsaiko
Date: Mon, 8 Jun 2020 22:46:53 +0200
Subject: Fix javadoc loss when renaming entry (#259)

---
 .../src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'enigma-server')

diff --git a/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java
index 6a7d2fd1..694d4321 100644
--- a/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java
@@ -4,10 +4,10 @@ import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import cuchaz.enigma.network.Message;
 import cuchaz.enigma.network.ServerPacketHandler;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.representation.entry.Entry;
-import cuchaz.enigma.network.Message;
 import cuchaz.enigma.utils.validation.PrintValidatable;
 import cuchaz.enigma.utils.validation.ValidationContext;
 
@@ -47,7 +47,8 @@ public class RenameC2SPacket implements Packet<ServerPacketHandler> {
 		boolean valid = handler.getServer().canModifyEntry(handler.getClient(), entry);
 
 		if (valid) {
-			handler.getServer().getMappings().mapFromObf(vc, entry, new EntryMapping(newName));
+			EntryMapping previous = handler.getServer().getMappings().getDeobfMapping(entry);
+			handler.getServer().getMappings().mapFromObf(vc, entry, previous != null ? previous.withName(newName) : new EntryMapping(newName));
 			valid = vc.canProceed();
 		}
 
-- 
cgit v1.2.3