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

Remove "Maple" prefix from MaplePacketCreator name

Browse Source
This commit is contained in:
P0nk
2021-08-19 21:31:57 +02:00
parent 579e3c639f
commit e184f25184
307 changed files with 2285 additions and 2328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/net/server/channel/handlers/AcceptFamilyHandler.java
View File

@@ -21,16 +21,11 @@
*/
package net.server.channel.handlers;
import config.YamlConfig;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import client.MapleCharacter;
import client.MapleClient;
import client.MapleFamily;
import client.MapleFamilyEntry;
import config.YamlConfig;
import net.AbstractMaplePacketHandler;
import net.server.coordinator.world.MapleInviteCoordinator;
import net.server.coordinator.world.MapleInviteCoordinator.InviteResult;
@@ -38,9 +33,13 @@ import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
import net.server.coordinator.world.MapleInviteCoordinator.MapleInviteResult;
import tools.DatabaseConnection;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
/**
*
* @author Jay Estrella
@@ -68,7 +67,7 @@ public final class AcceptFamilyHandler extends AbstractMaplePacketHandler {
MapleFamilyEntry newEntry = new MapleFamilyEntry(inviter.getFamily(), chr.getId(), chr.getName(), chr.getLevel(), chr.getJob());
newEntry.setCharacter(chr);
if(!newEntry.setSenior(inviter.getFamilyEntry(), true)) {
inviter.announce(MaplePacketCreator.sendFamilyMessage(1, 0));
inviter.announce(PacketCreator.sendFamilyMessage(1, 0));
return;
} else {
// save
@@ -82,15 +81,15 @@ public final class AcceptFamilyHandler extends AbstractMaplePacketHandler {
if(inviter.getFamily().getTotalGenerations() + targetFamily.getTotalGenerations() <= YamlConfig.config.server.FAMILY_MAX_GENERATIONS) {
targetEntry.join(inviter.getFamilyEntry());
} else {
inviter.announce(MaplePacketCreator.sendFamilyMessage(76, 0));
chr.announce(MaplePacketCreator.sendFamilyMessage(76, 0));
inviter.announce(PacketCreator.sendFamilyMessage(76, 0));
chr.announce(PacketCreator.sendFamilyMessage(76, 0));
return;
}
}
} else { // create new family
if(chr.getFamily() != null && inviter.getFamily() != null && chr.getFamily().getTotalGenerations() + inviter.getFamily().getTotalGenerations() >= YamlConfig.config.server.FAMILY_MAX_GENERATIONS) {
inviter.announce(MaplePacketCreator.sendFamilyMessage(76, 0));
chr.announce(MaplePacketCreator.sendFamilyMessage(76, 0));
inviter.announce(PacketCreator.sendFamilyMessage(76, 0));
chr.announce(PacketCreator.sendFamilyMessage(76, 0));
return;
}
MapleFamily newFamily = new MapleFamily(-1, c.getWorld());
@@ -113,15 +112,15 @@ public final class AcceptFamilyHandler extends AbstractMaplePacketHandler {
chr.getFamilyEntry().join(inviterEntry);
}
}
c.getPlayer().getFamily().broadcast(MaplePacketCreator.sendFamilyJoinResponse(true, c.getPlayer().getName()), c.getPlayer().getId());
c.announce(MaplePacketCreator.getSeniorMessage(inviter.getName()));
c.announce(MaplePacketCreator.getFamilyInfo(chr.getFamilyEntry()));
c.getPlayer().getFamily().broadcast(PacketCreator.sendFamilyJoinResponse(true, c.getPlayer().getName()), c.getPlayer().getId());
c.announce(PacketCreator.getSeniorMessage(inviter.getName()));
c.announce(PacketCreator.getFamilyInfo(chr.getFamilyEntry()));
chr.getFamilyEntry().updateSeniorFamilyInfo(true);
} else {
inviter.announce(MaplePacketCreator.sendFamilyJoinResponse(false, c.getPlayer().getName()));
inviter.announce(PacketCreator.sendFamilyJoinResponse(false, c.getPlayer().getName()));
}
}
c.announce(MaplePacketCreator.sendFamilyMessage(0, 0));
c.announce(PacketCreator.sendFamilyMessage(0, 0));
}
private static void insertNewFamilyRecord(int characterID, int familyID, int seniorID, boolean updateChar) {