diff options
| author | 2020-06-08 22:46:53 +0200 | |
|---|---|---|
| committer | 2020-06-08 16:46:53 -0400 | |
| commit | dd892bb6c8ae913021b4caa2b9e3caea3b8c10bb (patch) | |
| tree | 447e24ee533c9dcf57ab3de89907038eeb722fc6 /enigma-server/src/main/java | |
| parent | Dont count synthetic fields in stats gen (#267) (diff) | |
| download | enigma-fork-dd892bb6c8ae913021b4caa2b9e3caea3b8c10bb.tar.gz enigma-fork-dd892bb6c8ae913021b4caa2b9e3caea3b8c10bb.tar.xz enigma-fork-dd892bb6c8ae913021b4caa2b9e3caea3b8c10bb.zip | |
Fix javadoc loss when renaming entry (#259)
Diffstat (limited to 'enigma-server/src/main/java')
| -rw-r--r-- | enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java | 5 |
1 files changed, 3 insertions, 2 deletions
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 6a7d2fd..694d432 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; | |||
| 4 | import java.io.DataOutput; | 4 | import java.io.DataOutput; |
| 5 | import java.io.IOException; | 5 | import java.io.IOException; |
| 6 | 6 | ||
| 7 | import cuchaz.enigma.network.Message; | ||
| 7 | import cuchaz.enigma.network.ServerPacketHandler; | 8 | import cuchaz.enigma.network.ServerPacketHandler; |
| 8 | import cuchaz.enigma.translation.mapping.EntryMapping; | 9 | import cuchaz.enigma.translation.mapping.EntryMapping; |
| 9 | import cuchaz.enigma.translation.representation.entry.Entry; | 10 | import cuchaz.enigma.translation.representation.entry.Entry; |
| 10 | import cuchaz.enigma.network.Message; | ||
| 11 | import cuchaz.enigma.utils.validation.PrintValidatable; | 11 | import cuchaz.enigma.utils.validation.PrintValidatable; |
| 12 | import cuchaz.enigma.utils.validation.ValidationContext; | 12 | import cuchaz.enigma.utils.validation.ValidationContext; |
| 13 | 13 | ||
| @@ -47,7 +47,8 @@ public class RenameC2SPacket implements Packet<ServerPacketHandler> { | |||
| 47 | boolean valid = handler.getServer().canModifyEntry(handler.getClient(), entry); | 47 | boolean valid = handler.getServer().canModifyEntry(handler.getClient(), entry); |
| 48 | 48 | ||
| 49 | if (valid) { | 49 | if (valid) { |
| 50 | handler.getServer().getMappings().mapFromObf(vc, entry, new EntryMapping(newName)); | 50 | EntryMapping previous = handler.getServer().getMappings().getDeobfMapping(entry); |
| 51 | handler.getServer().getMappings().mapFromObf(vc, entry, previous != null ? previous.withName(newName) : new EntryMapping(newName)); | ||
| 51 | valid = vc.canProceed(); | 52 | valid = vc.canProceed(); |
| 52 | } | 53 | } |
| 53 | 54 | ||