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

PlayerNPC patch + Wedding ring effects + Bypassable PIN/PIC + SP cap

Browse Source 
Fixed an issue with delayed item pickups.
Fixed ClearSlot command not removing rechargeables from inventory.
Fixed Resurrection and Hyper Body animation effect not working for other players.
Implemented bypassable PIN/PIC, applied on accounts after a successful authentication, remaining active while activity is detected for that account.
Fixed anti-multiclient system not properly registering players logged in via all-chars-view.
Fixed cases where players still could gain EXP from much higher-leveled mobs if they were on an event instance.
Optimized scroll result method performance.
Added a server flag for SP cap limit on the player's current job (missing amount are reobtained after changing jobs).
PlayerNPCs now have overridable scripts.
Fixed some mapobject issues with PlayerNPCs, potencially leading to disappearing from maps in certain circumstances.
Fixed SpawnAllPnpcs command not properly spawning all PlayersNPCs.
Added extra info on Abdula, now stating whether a book can be obtained from questline or not.
Fixed marriage ring effects.
Fixed some cases where marriage rings were being able to be sent out from the character owner.
Fixed Duey allowing send untradeable items.
New tool: MapleWorldmapChecker. It reads Map.wz XMLs, fetching mapids not properly referenced on the worldmap nodes.
This commit is contained in:
ronancpl
2018-10-25 07:09:35 -03:00
parent 17d3ffe1c3
commit 8f8cd815aa
87 changed files with 2040 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/tools/MaplePacketCreator.java
View File

@@ -713,13 +713,13 @@ public class MaplePacketCreator {
mplew.write(0);
mplew.write(0); // IsQuietBan
mplew.writeLong(0);//IsQuietBanTimeStamp
mplew.writeLong(0); //CreationTimeStamp
mplew.writeLong(0);//IsQuietBanTimeStamp
mplew.writeLong(0); //CreationTimeStamp
mplew.writeInt(1); // 1: Remove the "Select the world you want to play in"
mplew.write(ServerConstants.ENABLE_PIN ? 0 : 1); // 0 = Pin-System Enabled, 1 = Disabled
mplew.write(ServerConstants.ENABLE_PIC ? (c.getPic() == null ? 0 : 1) : 2); // 0 = Register PIC, 1 = Ask for PIC, 2 = Disabled
mplew.write(ServerConstants.ENABLE_PIN && !c.canBypassPin() ? 0 : 1); // 0 = Pin-System Enabled, 1 = Disabled
mplew.write(ServerConstants.ENABLE_PIC && !c.canBypassPic() ? (c.getPic() == null ? 0 : 1) : 2); // 0 = Register PIC, 1 = Ask for PIC, 2 = Disabled
return mplew.getPacket();
}
@@ -889,7 +889,7 @@ public class MaplePacketCreator {
addCharEntry(mplew, chr, false);
}
mplew.write(ServerConstants.ENABLE_PIC ? (c.getPic() == null ? 0 : 1) : 2);
mplew.write(ServerConstants.ENABLE_PIC && !c.canBypassPic() ? (c.getPic() == null ? 0 : 1) : 2);
mplew.writeInt(ServerConstants.COLLECTIVE_CHARSLOT ? chars.size() + c.getAvailableCharacterSlots() : c.getCharacterSlots());
return mplew.getPacket();
}
@@ -1049,7 +1049,7 @@ public class MaplePacketCreator {
mplew.writeShort(chr.getHp());
mplew.writeBool(false);
mplew.writeLong(getTime(Server.getInstance().getCurrentTime()));
mplew.writeInt(0);
mplew.skip(5);
return mplew.getPacket();
}
@@ -1066,7 +1066,7 @@ public class MaplePacketCreator {
mplew.writeInt(spawnPosition.x); // spawn position placement thanks to Arnah (Vertisy)
mplew.writeInt(spawnPosition.y);
mplew.writeLong(getTime(Server.getInstance().getCurrentTime()));
mplew.writeInt(0);
mplew.skip(5);
return mplew.getPacket();
}
@@ -1829,19 +1829,12 @@ public class MaplePacketCreator {
/**
* Gets a packet spawning a player as a mapobject to other clients.
*
* @param target The client receiving this packet.
* @param chr The character to spawn to other clients.
* @param enteringField Whether the character to spawn is not yet present in the map or already is.
* @return The spawn player packet.
*/
public static byte[] spawnPlayerMapObject(MapleCharacter chr) {
return spawnPlayerMapObject(chr, false);
}
public static byte[] spawnEnterPlayerMapObject(MapleCharacter chr) {
return spawnPlayerMapObject(chr, true);
}
private static byte[] spawnPlayerMapObject(MapleCharacter chr, boolean enteringField) {
public static byte[] spawnPlayerMapObject(MapleClient target, MapleCharacter chr, boolean enteringField) {
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
mplew.writeShort(SendOpcode.SPAWN_PLAYER.getValue());
mplew.writeInt(chr.getId());
@@ -2013,7 +2006,7 @@ public class MaplePacketCreator {
}
addRingLook(mplew, chr, true); // crush
addRingLook(mplew, chr, false); // friendship
addMarriageRingLook(mplew, chr);
addMarriageRingLook(target, mplew, chr);
encodeNewYearCardInfo(mplew, chr); // new year seems to crash sometimes...
mplew.skip(2);
mplew.write(chr.getTeam());//only needed in specific fields
@@ -2137,17 +2130,23 @@ public class MaplePacketCreator {
}
}
private static void addMarriageRingLook(final MaplePacketLittleEndianWriter mplew, MapleCharacter chr) {
private static void addMarriageRingLook(MapleClient target, final MaplePacketLittleEndianWriter mplew, MapleCharacter chr) {
MapleRing ring = chr.getMarriageRing();
if (ring != null && !ring.equipped()) {
if (ring == null || !ring.equipped()) {
mplew.write(0);
return;
}
mplew.writeBool(ring != null);
if (ring != null) {
mplew.writeInt(chr.getId());
mplew.writeInt(ring.getPartnerChrId());
} else {
mplew.write(1);
MapleCharacter targetChr = target.getPlayer();
if (targetChr != null && targetChr.getPartnerId() == chr.getId()) {
mplew.writeInt(0); // 1a pessoa: ser 0 0 implica match...
mplew.writeInt(0); // 3a pessoa: 1 2 2 1 funciona!
} else {
mplew.writeInt(chr.getId()); // 1a pessoa: ser 0 0 implica match...
mplew.writeInt(ring.getPartnerChrId()); // 3a pessoa: 1 2 2 1 funciona!
}
mplew.writeInt(ring.getItemId());
}
}
@@ -2558,7 +2557,7 @@ public class MaplePacketCreator {
return mplew.getPacket();
}
public static byte[] updateCharLook(MapleCharacter chr) {
public static byte[] updateCharLook(MapleClient target, MapleCharacter chr) {
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
mplew.writeShort(SendOpcode.UPDATE_CHAR_LOOK.getValue());
mplew.writeInt(chr.getId());
@@ -2566,7 +2565,7 @@ public class MaplePacketCreator {
addCharLook(mplew, chr, false);
addRingLook(mplew, chr, true);
addRingLook(mplew, chr, false);
addMarriageRingLook(mplew, chr);
addMarriageRingLook(target, mplew, chr);
mplew.writeInt(0);
return mplew.getPacket();
}
@@ -2913,6 +2912,7 @@ public class MaplePacketCreator {
}
mplew.writeMapleAsciiString(q.getQuestData());
mplew.skip(5);
return mplew.getPacket();
}