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

Reformat and clean up "net" package

Browse Source
This commit is contained in:
P0nk
2021-09-09 23:26:02 +02:00
parent 69f4580637
commit 6be6ea9927
235 changed files with 3556 additions and 3398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,6 @@ import java.sql.PreparedStatement;
import java.sql.SQLException;
/**
*
* @author Jay Estrella
* @author Ubaware
*/
@@ -49,7 +48,7 @@ public final class AcceptFamilyHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, Client c) {
if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) {
if (!YamlConfig.config.server.USE_FAMILY_SYSTEM) {
return;
}
Character chr = c.getPlayer();
@@ -58,15 +57,17 @@ public final class AcceptFamilyHandler extends AbstractPacketHandler {
boolean accept = p.readByte() != 0;
// String inviterName = slea.readMapleAsciiString();
Character inviter = c.getWorldServer().getPlayerStorage().getCharacterById(inviterId);
if(inviter != null) {
if (inviter != null) {
InviteResult inviteResult = InviteCoordinator.answerInvite(InviteType.FAMILY, c.getPlayer().getId(), c.getPlayer(), accept);
if(inviteResult.result == InviteResultType.NOT_FOUND) return; //was never invited. (or expired on server only somehow?)
if(accept) {
if(inviter.getFamily() != null) {
if(chr.getFamily() == null) {
if (inviteResult.result == InviteResultType.NOT_FOUND) {
return; //was never invited. (or expired on server only somehow?)
}
if (accept) {
if (inviter.getFamily() != null) {
if (chr.getFamily() == null) {
FamilyEntry newEntry = new FamilyEntry(inviter.getFamily(), chr.getId(), chr.getName(), chr.getLevel(), chr.getJob());
newEntry.setCharacter(chr);
if(!newEntry.setSenior(inviter.getFamilyEntry(), true)) {
if (!newEntry.setSenior(inviter.getFamilyEntry(), true)) {
inviter.sendPacket(PacketCreator.sendFamilyMessage(1, 0));
return;
} else {
@@ -77,8 +78,10 @@ public final class AcceptFamilyHandler extends AbstractPacketHandler {
} else { //absorb target family
FamilyEntry targetEntry = chr.getFamilyEntry();
Family targetFamily = targetEntry.getFamily();
if(targetFamily.getLeader() != targetEntry) return;
if(inviter.getFamily().getTotalGenerations() + targetFamily.getTotalGenerations() <= YamlConfig.config.server.FAMILY_MAX_GENERATIONS) {
if (targetFamily.getLeader() != targetEntry) {
return;
}
if (inviter.getFamily().getTotalGenerations() + targetFamily.getTotalGenerations() <= YamlConfig.config.server.FAMILY_MAX_GENERATIONS) {
targetEntry.join(inviter.getFamilyEntry());
} else {
inviter.sendPacket(PacketCreator.sendFamilyMessage(76, 0));
@@ -87,7 +90,7 @@ public final class AcceptFamilyHandler extends AbstractPacketHandler {
}
}
} else { // create new family
if(chr.getFamily() != null && inviter.getFamily() != null && chr.getFamily().getTotalGenerations() + inviter.getFamily().getTotalGenerations() >= YamlConfig.config.server.FAMILY_MAX_GENERATIONS) {
if (chr.getFamily() != null && inviter.getFamily() != null && chr.getFamily().getTotalGenerations() + inviter.getFamily().getTotalGenerations() >= YamlConfig.config.server.FAMILY_MAX_GENERATIONS) {
inviter.sendPacket(PacketCreator.sendFamilyMessage(76, 0));
chr.sendPacket(PacketCreator.sendFamilyMessage(76, 0));
return;
@@ -96,9 +99,9 @@ public final class AcceptFamilyHandler extends AbstractPacketHandler {
c.getWorldServer().addFamily(newFamily.getID(), newFamily);
FamilyEntry inviterEntry = new FamilyEntry(newFamily, inviter.getId(), inviter.getName(), inviter.getLevel(), inviter.getJob());
inviterEntry.setCharacter(inviter);
newFamily.setLeader(inviter.getFamilyEntry());
newFamily.setLeader(inviter.getFamilyEntry());
newFamily.addEntry(inviterEntry);
if(chr.getFamily() == null) { //completely new family
if (chr.getFamily() == null) { //completely new family
FamilyEntry newEntry = new FamilyEntry(newFamily, chr.getId(), chr.getName(), chr.getLevel(), chr.getJob());
newEntry.setCharacter(chr);
newEntry.setSenior(inviterEntry, true);
@@ -107,7 +110,7 @@ public final class AcceptFamilyHandler extends AbstractPacketHandler {
insertNewFamilyRecord(chr.getId(), newFamily.getID(), inviter.getId(), false); // char was already saved from setSenior() above
newFamily.setMessage("", true);
} else { //new family for inviter, absorb invitee family
insertNewFamilyRecord(inviter.getId(), newFamily.getID(), 0 , true);
insertNewFamilyRecord(inviter.getId(), newFamily.getID(), 0, true);
newFamily.setMessage("", true);
chr.getFamilyEntry().join(inviterEntry);
}
@@ -124,27 +127,27 @@ public final class AcceptFamilyHandler extends AbstractPacketHandler {
}
private static void insertNewFamilyRecord(int characterID, int familyID, int seniorID, boolean updateChar) {
try(Connection con = DatabaseConnection.getConnection()) {
try(PreparedStatement ps = con.prepareStatement("INSERT INTO family_character (cid, familyid, seniorid) VALUES (?, ?, ?)")) {
try (Connection con = DatabaseConnection.getConnection()) {
try (PreparedStatement ps = con.prepareStatement("INSERT INTO family_character (cid, familyid, seniorid) VALUES (?, ?, ?)")) {
ps.setInt(1, characterID);
ps.setInt(2, familyID);
ps.setInt(3, seniorID);
ps.executeUpdate();
} catch(SQLException e) {
} catch (SQLException e) {
FilePrinter.printError(FilePrinter.FAMILY_ERROR, e, "Could not save new family record for char id " + characterID + ".");
e.printStackTrace();
}
if(updateChar) {
try(PreparedStatement ps = con.prepareStatement("UPDATE characters SET familyid = ? WHERE id = ?")) {
if (updateChar) {
try (PreparedStatement ps = con.prepareStatement("UPDATE characters SET familyid = ? WHERE id = ?")) {
ps.setInt(1, familyID);
ps.setInt(2, characterID);
ps.executeUpdate();
} catch(SQLException e) {
} catch (SQLException e) {
FilePrinter.printError(FilePrinter.FAMILY_ERROR, e, "Could not update 'characters' 'familyid' record for char id " + characterID + ".");
e.printStackTrace();
}
}
} catch(SQLException e) {
} catch (SQLException e) {
FilePrinter.printError(FilePrinter.FAMILY_ERROR, e, "Could not get connection to DB.");
e.printStackTrace();
}