Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/main/java/neon/entities/Door.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@

package neon.entities;

import lombok.Setter;
import java.util.Objects;
import lombok.Getter;
import neon.entities.components.DoorRenderComponent;
import neon.entities.components.Lock;
import neon.entities.components.Portal;
Expand All @@ -30,8 +31,7 @@ public class Door extends Item {
public final Lock lock;
public final Trap trap;
public final Portal portal;

@Setter private String sign;
@Getter private String sign = "";

public Door(long uid, RItem resource) {
super(uid, resource);
Expand All @@ -42,11 +42,15 @@ public Door(long uid, RItem resource) {
}

public boolean hasSign() {
return sign != null;
return sign != null && !sign.isEmpty();
}

public void setSign(String newSign) {
sign = Objects.requireNonNullElse(newSign, "");
}

public String toString() {
if (sign != null) {
if (sign != null && !sign.isEmpty()) {
return sign;
} else {
return super.toString();
Expand Down
61 changes: 0 additions & 61 deletions src/main/java/neon/entities/serialization/EntitySerializer.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public void serialize(DataOutput output, Item item) throws IOException {

switch (item) {
case Door door -> {
output.writeUTF(door.toString());
output.writeUTF(door.getSign());
writePortal(output, door.portal);
writeLock(output, door.lock);
writeTrap(output, door.trap);
Expand Down
Loading