Project cleanup pre merge.

This commit is contained in:
2023-07-15 09:23:48 -04:00
parent 134b651df8
commit 9bbdef224d
747 changed files with 99704 additions and 101200 deletions
+114 -119
View File
@@ -20,92 +20,92 @@ import engine.server.world.WorldServer;
public class ChatTellMsg extends AbstractChatMsg {
protected AbstractWorldObject target;
protected int targetType;
protected int targetID;
protected String targetName;
protected int unknown03;
protected AbstractWorldObject target;
protected int targetType;
protected int targetID;
protected String targetName;
protected int unknown03;
/**
* This is the general purpose constructor.
*/
public ChatTellMsg(AbstractWorldObject source, AbstractWorldObject target, String message) {
super(Protocol.CHATTELL, source, message);
this.target = target;
/**
* This is the general purpose constructor.
*/
public ChatTellMsg(AbstractWorldObject source, AbstractWorldObject target, String message) {
super(Protocol.CHATTELL, source, message);
this.target = target;
// TODO could this be simplified? Check serializer;
if (this.target != null) {
this.targetType = target.getObjectType().ordinal();
this.targetID = target.getObjectUUID();
this.targetName = target.getName();
}
this.unknown03 = 0;
}
// TODO could this be simplified? Check serializer;
if (this.target != null) {
this.targetType = target.getObjectType().ordinal();
this.targetID = target.getObjectUUID();
this.targetName = target.getName();
}
this.unknown03 = 0;
}
/**
* Copy constructor
*/
public ChatTellMsg(ChatTellMsg msg) {
super(msg);
this.target = msg.target;
this.targetType = msg.targetType;
this.targetID = msg.targetID;
this.targetName = msg.targetName;
this.unknown03 = msg.unknown03;
}
/**
* Copy constructor
*/
public ChatTellMsg(ChatTellMsg msg) {
super(msg);
this.target = msg.target;
this.targetType = msg.targetType;
this.targetID = msg.targetID;
this.targetName = msg.targetName;
this.unknown03 = msg.unknown03;
}
public int getTargetType() {
return targetType;
}
/**
* This constructor is used by NetMsgFactory. It attempts to deserialize the
* ByteBuffer into a message. If a BufferUnderflow occurs (based on reading
* past the limit) then this constructor Throws that Exception to the
* caller.
*/
public ChatTellMsg(AbstractConnection origin, ByteBufferReader reader) {
super(Protocol.CHATTELL, origin, reader);
}
public int getTargetID() {
return targetID;
}
public int getTargetType() {
return targetType;
}
/**
* This constructor is used by NetMsgFactory. It attempts to deserialize the
* ByteBuffer into a message. If a BufferUnderflow occurs (based on reading
* past the limit) then this constructor Throws that Exception to the
* caller.
*/
public ChatTellMsg(AbstractConnection origin, ByteBufferReader reader) {
super(Protocol.CHATTELL, origin, reader);
}
public int getTargetID() {
return targetID;
}
/**
* Deserializes the subclass specific items from the supplied ByteBufferReader.
*/
@Override
protected void _deserialize(ByteBufferReader reader) {
this.sourceType = reader.getInt();
this.sourceID = reader.getInt();
this.unknown01 = reader.getInt();
this.message = reader.getString();
this.sourceName = reader.getString(); // sourceName
this.targetType = reader.getInt();
this.targetID = reader.getInt();
this.targetName = reader.getString();
this.unknown02 = reader.getInt();
this.unknown03 = reader.getInt();
}
/**
* Deserializes the subclass specific items from the supplied ByteBufferReader.
*/
@Override
protected void _deserialize(ByteBufferReader reader) {
this.sourceType = reader.getInt();
this.sourceID = reader.getInt();
this.unknown01 = reader.getInt();
this.message = reader.getString();
this.sourceName = reader.getString(); // sourceName
this.targetType = reader.getInt();
this.targetID = reader.getInt();
this.targetName = reader.getString();
this.unknown02 = reader.getInt();
this.unknown03 = reader.getInt();
}
/**
* Serializes the subclass specific items to the supplied ByteBufferWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.source.getObjectType().ordinal());
writer.putInt(source.getObjectUUID());
writer.putInt(this.unknown01);
writer.putString(this.message);
if (AbstractWorldObject.IsAbstractCharacter(source)) {
writer.putString(((AbstractCharacter) this.source).getFirstName());
} else {
writer.putString(this.source.getName());
}
if (this.target != null) {
writer.putInt(this.target.getObjectType().ordinal());
writer.putInt(this.target.getObjectUUID());
/**
* Serializes the subclass specific items to the supplied ByteBufferWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.source.getObjectType().ordinal());
writer.putInt(source.getObjectUUID());
writer.putInt(this.unknown01);
writer.putString(this.message);
if (AbstractWorldObject.IsAbstractCharacter(source)) {
writer.putString(((AbstractCharacter) this.source).getFirstName());
} else {
writer.putString(this.source.getName());
}
if (this.target != null) {
writer.putInt(this.target.getObjectType().ordinal());
writer.putInt(this.target.getObjectUUID());
if (AbstractWorldObject.IsAbstractCharacter(target)) {
writer.putString(((AbstractCharacter) this.target).getFirstName());
} else {
@@ -120,52 +120,47 @@ public class ChatTellMsg extends AbstractChatMsg {
writer.putInt(WorldServer.worldMapID);
}
/**
* @return the target
*/
public AbstractWorldObject getTarget() {
return target;
}
/**
* @return the target
*/
public AbstractWorldObject getTarget() {
return target;
}
/**
* @param target
* the target to set
*/
public void setTarget(AbstractWorldObject target) {
this.target = target;
}
/**
* @param target the target to set
*/
public void setTarget(AbstractWorldObject target) {
this.target = target;
}
/**
* @return the targetName
*/
public String getTargetName() {
return targetName;
}
/**
* @param targetName the targetName to set
*/
public void setTargetName(String targetName) {
this.targetName = targetName;
}
/**
* @return the targetName
*/
public String getTargetName() {
return targetName;
}
/**
* @return the unknown03
*/
public int getUnknown03() {
return unknown03;
}
/**
* @param targetName
* the targetName to set
*/
public void setTargetName(String targetName) {
this.targetName = targetName;
}
/**
* @return the unknown03
*/
public int getUnknown03() {
return unknown03;
}
/**
* @param unknown03
* the unknown03 to set
*/
public void setUnknown03(int unknown03) {
this.unknown03 = unknown03;
}
/**
* @param unknown03 the unknown03 to set
*/
public void setUnknown03(int unknown03) {
this.unknown03 = unknown03;
}
}