forked from MagicBane/Server
Renamed class to not conflict with the java.lang version.
This commit is contained in:
@@ -9,9 +9,9 @@
|
||||
|
||||
package engine.net.client.msg.guild;
|
||||
|
||||
import engine.Enum;
|
||||
import engine.Enum.GameObjectType;
|
||||
import engine.gameManager.SessionManager;
|
||||
import engine.mbEnums;
|
||||
import engine.mbEnums.GameObjectType;
|
||||
import engine.net.AbstractConnection;
|
||||
import engine.net.ByteBufferReader;
|
||||
import engine.net.ByteBufferWriter;
|
||||
@@ -125,7 +125,7 @@ class GuildListMessageType1 extends GuildListMessageType {
|
||||
|
||||
@Override
|
||||
void _serialize(ByteBufferWriter writer) {
|
||||
Enum.GuildCharterType gt = Enum.GuildCharterType.getGuildTypeFromInt(g.getCharter());
|
||||
mbEnums.GuildCharterType gt = mbEnums.GuildCharterType.getGuildTypeFromInt(g.getCharter());
|
||||
|
||||
writer.putInt(1);
|
||||
writer.putInt(gt.ordinal()); //Charter Type
|
||||
@@ -142,7 +142,7 @@ class GuildListMessageType1 extends GuildListMessageType {
|
||||
for (PlayerCharacter player : guildRoster) {
|
||||
|
||||
byte isActive = SessionManager.getPlayerCharacterByID(player.getObjectUUID()) != null ? (byte) 1 : (byte) 0;
|
||||
writer.putInt(Enum.GameObjectType.PlayerCharacter.ordinal());
|
||||
writer.putInt(mbEnums.GameObjectType.PlayerCharacter.ordinal());
|
||||
writer.putInt(player.getObjectUUID());
|
||||
writer.putString(player.getCombinedName());
|
||||
writer.put(isActive); //Active?
|
||||
@@ -158,7 +158,7 @@ class GuildListMessageType1 extends GuildListMessageType {
|
||||
|
||||
for (PlayerCharacter banished : g.getBanishList()) {
|
||||
byte isActive = SessionManager.getPlayerCharacterByID(banished.getObjectUUID()) != null ? (byte) 1 : (byte) 0;
|
||||
writer.putInt(Enum.GameObjectType.PlayerCharacter.ordinal());
|
||||
writer.putInt(mbEnums.GameObjectType.PlayerCharacter.ordinal());
|
||||
writer.putInt(banished.getObjectUUID());
|
||||
writer.putString(banished.getCombinedName());
|
||||
writer.put(isActive); //Active?
|
||||
|
||||
Reference in New Issue
Block a user