Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleClient

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:13:48 +02:00
parent da8837710a
commit b07e6799dc
425 changed files with 1110 additions and 1109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/server/life/MapleMonster.java
View File

@@ -1017,7 +1017,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
@Override
public void sendSpawnData(MapleClient client) {
public void sendSpawnData(Client client) {
if (hp.get() <= 0) { // mustn't monsterLock this function
return;
}
@@ -1033,7 +1033,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
@Override
public void sendDestroyData(MapleClient client) {
public void sendDestroyData(Client client) {
client.sendPacket(PacketCreator.killMonster(getObjectId(), false));
client.sendPacket(PacketCreator.killMonster(getObjectId(), true));
}
@@ -2101,7 +2101,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
}
private static void aggroMonsterControl(MapleClient c, MapleMonster mob, boolean immediateAggro) {
private static void aggroMonsterControl(Client c, MapleMonster mob, boolean immediateAggro) {
c.sendPacket(PacketCreator.controlMonster(mob, false, immediateAggro));
}
@@ -2120,7 +2120,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
chrController.sendPacket(PacketCreator.removeSummon(puppet, false));
MapleClient c = chrController.getClient();
Client c = chrController.getClient();
for (MapleMonster mob : puppetControlled) { // thanks BHB for noticing puppets disrupting mobstatuses for bowmans
aggroMonsterControl(c, mob, mob.isControllerKnowsAboutAggro());
}

8
src/main/java/server/life/MapleNPC.java
View File

@@ -21,7 +21,7 @@
*/
package server.life;
import client.MapleClient;
import client.Client;
import server.MapleShopFactory;
import server.maps.MapleMapObjectType;
import tools.PacketCreator;
@@ -38,18 +38,18 @@ public class MapleNPC extends AbstractLoadedMapleLife {
return MapleShopFactory.getInstance().getShopForNPC(getId()) != null;
}
public void sendShop(MapleClient c) {
public void sendShop(Client c) {
MapleShopFactory.getInstance().getShopForNPC(getId()).sendShop(c);
}
@Override
public void sendSpawnData(MapleClient client) {
public void sendSpawnData(Client client) {
client.sendPacket(PacketCreator.spawnNPC(this));
client.sendPacket(PacketCreator.spawnNPCRequestController(this, true));
}
@Override
public void sendDestroyData(MapleClient client) {
public void sendDestroyData(Client client) {
client.sendPacket(PacketCreator.removeNPCController(getObjectId()));
client.sendPacket(PacketCreator.removeNPC(getObjectId()));
}

8
src/main/java/server/life/MaplePlayerNPC.java
View File

@@ -22,7 +22,7 @@
package server.life;
import client.Character;
import client.MapleClient;
import client.Client;
import client.inventory.InventoryType;
import client.inventory.Item;
import config.YamlConfig;
@@ -199,13 +199,13 @@ public class MaplePlayerNPC extends AbstractMapleMapObject {
}
@Override
public void sendSpawnData(MapleClient client) {
public void sendSpawnData(Client client) {
client.sendPacket(PacketCreator.spawnPlayerNPC(this));
client.sendPacket(PacketCreator.getPlayerNPC(this));
}
@Override
public void sendDestroyData(MapleClient client) {
public void sendDestroyData(Client client) {
client.sendPacket(PacketCreator.removeNPCController(this.getObjectId()));
client.sendPacket(PacketCreator.removePlayerNPC(this.getObjectId()));
}
@@ -588,7 +588,7 @@ public class MaplePlayerNPC extends AbstractMapleMapObject {
World wserv = Server.getInstance().getWorld(world);
if (wserv == null) return;
MapleClient c = MapleClient.createMock();
Client c = Client.createMock();
c.setWorld(world);
c.setChannel(1);