diff --git a/LoginServer/build.xml b/LoginServer/build.xml index 918f4d7..5dc76a7 100644 --- a/LoginServer/build.xml +++ b/LoginServer/build.xml @@ -9,7 +9,7 @@ - + diff --git a/LoginServer/conf/Config.xml b/LoginServer/conf/Config.xml index 2cbceba..88a661f 100644 --- a/LoginServer/conf/Config.xml +++ b/LoginServer/conf/Config.xml @@ -11,5 +11,5 @@ localhost 8186 http://localhost/auth.php - org.moparscape.msc.ls.persistence.impl.MySQL + org.moparscape.msc.ls.persistence.impl.DummyStorageMedium diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerSaveHandler.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerSaveHandler.java index 7cdb870..f1784cf 100644 --- a/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerSaveHandler.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerSaveHandler.java @@ -36,7 +36,7 @@ public class PlayerSaveHandler implements PacketHandler { //save.setPoints(p.readInt()); for (int i = 0; i < 18; i++) { - save.setStat(i, p.readInt(), p.readShort()); + save.setStat(i, (int) p.readLong(), p.readShort()); } int invCount = p.readShort(); diff --git a/LoginServer/src/org/moparscape/msc/ls/persistence/impl/DummyStorageMedium.java b/LoginServer/src/org/moparscape/msc/ls/persistence/impl/DummyStorageMedium.java new file mode 100644 index 0000000..cc6bce3 --- /dev/null +++ b/LoginServer/src/org/moparscape/msc/ls/persistence/impl/DummyStorageMedium.java @@ -0,0 +1,183 @@ +package org.moparscape.msc.ls.persistence.impl; + +import java.util.Arrays; +import java.util.List; + +import org.moparscape.msc.ls.model.PlayerSave; +import org.moparscape.msc.ls.persistence.StorageMedium; +import org.moparscape.msc.ls.util.Config; + +public class DummyStorageMedium implements StorageMedium { + + @Override + public boolean savePlayer(PlayerSave s) { + + return true; + } + + @Override + public void shutdown() { + + } + + @Override + public void logTrade(long from, long to, int item, long amount, int x, + int y, int type, long date) { + + } + + @Override + public void logReport(long user, long reported, byte reason, int x, int y, + String status) { + + } + + @Override + public void resetOnlineFlag(int world) { + + } + + @Override + public void logKill(long user, long killed, byte type) { + + } + + @Override + public void addFriend(long user, long friend) { + + } + + @Override + public boolean addFriend_isOnline0(long user, long friend) { + + return false; + } + + @Override + public boolean addFriend_isOnline1(long friend, long user) { + + return false; + } + + @Override + public void removeFriend(long user, long friend) { + + } + + @Override + public boolean removeFriend_isOnline(long user) { + + return false; + } + + @Override + public void addIgnore(long user, long friend) { + + } + + @Override + public void removeIgnore(long user, long friend) { + + } + + @Override + public List getFriendsOnline(long user) { + + return null; + } + + @Override + public void chatBlock(int on, long user) { + + } + + @Override + public void privateBlock(int on, long user) { + + } + + @Override + public List getPrivateBlockFriendsOnline(long user) { + + return null; + } + + @Override + public void tradeBlock(int on, long user) { + + } + + @Override + public void duelBlock(int on, long user) { + + } + + @Override + public boolean playerExists(long user) { + + return true; + } + + @Override + public boolean isBanned(long user) { + return false; + } + + @Override + public int getGroupID(long user) { + // Dev mode + return 11; + } + + @Override + public long getOwner(long user) { + return 0; + } + + @Override + public void setOnlineFlag(int id, long user) { + + } + + @Override + public boolean ban(boolean setBanned, long user) { + return false; + } + + @Override + public void logBan(long user, long modhash) { + + } + + @Override + public void setGameSettings(int idx, boolean on, long user) { + + } + + @Override + public PlayerSave loadPlayer(long user) { + PlayerSave save = new PlayerSave(user); + save.setLocation(213, 452); + save.setAppearance((byte) 2, (byte) 8, (byte) 14, (byte) 0, (byte) 1, + (byte) 2, true, 0l); + + int[] arrayOfOnes = new int[Config.statArray.length]; + Arrays.fill(arrayOfOnes, 1); + + save.setExp(arrayOfOnes.clone()); + save.setCurStats(arrayOfOnes.clone()); + + return save; + } + + @Override + public void logLogin(long user, String ip) { + + } + + @Override + public void logIn(String ip, long user) { + + } + +} diff --git a/LoginServer/src/org/moparscape/msc/ls/persistence/impl/MySQL.java b/LoginServer/src/org/moparscape/msc/ls/persistence/impl/MySQL.java index 3344c5d..b46f6cb 100644 --- a/LoginServer/src/org/moparscape/msc/ls/persistence/impl/MySQL.java +++ b/LoginServer/src/org/moparscape/msc/ls/persistence/impl/MySQL.java @@ -108,7 +108,7 @@ public class MySQL implements StorageMedium { conn.updateQuery(query.substring(0, query.length() - 1) + " WHERE `user`=" + s.getUser()); - + System.out.println(s.getEventCD()); updateLongs(Statements.save_SetEventCD, s.getEventCD() / 1000, s.getUser()); return true;