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

Exp gain & Chaos scroll fix + Diet's MK Overhaul

Browse Source 
Fixed issues with negative experience being distributed to characters
when killing a mob, rendering "Exp reset". Fixed chaos scroll behaving
oddly. Refactored debuff expirations to manage one list with registered
debuffs and expire times, thus lifting some load from the TimerManager.
Added concurrency protection on how World deals with parties. Thanks to
the DietStory dev team, fixed some issues with the MK maps.
This commit is contained in:
ronancpl
2017-10-04 02:35:52 -03:00
parent 6445f0b4e4
commit 3a882c7f31
141 changed files with 1719 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/net/server/channel/handlers/EnterCashShopHandler.java
View File

@@ -52,6 +52,7 @@ public class EnterCashShopHandler extends AbstractMaplePacketHandler {
Server.getInstance().getPlayerBuffStorage().addBuffsToStorage(mc.getId(), mc.getAllBuffs());
mc.cancelAllBuffs(true);
mc.cancelBuffExpireTask();
mc.cancelDiseaseExpireTask();
mc.cancelSkillCooldownTask();
mc.cancelExpirationTask();

1
src/net/server/channel/handlers/EnterMTSHandler.java
View File

@@ -61,6 +61,7 @@ public final class EnterMTSHandler extends AbstractMaplePacketHandler {
Server.getInstance().getPlayerBuffStorage().addBuffsToStorage(chr.getId(), chr.getAllBuffs());
chr.cancelAllBuffs(true);
chr.cancelBuffExpireTask();
chr.cancelDiseaseExpireTask();
chr.cancelSkillCooldownTask();
chr.cancelExpirationTask();
chr.saveToDB();

47
src/net/server/channel/handlers/PartyOperationHandler.java
View File

@@ -30,6 +30,8 @@ import tools.MaplePacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import client.MapleCharacter;
import client.MapleClient;
import scripting.event.EventInstanceManager;
import server.maps.MapleMap;
public final class PartyOperationHandler extends AbstractMaplePacketHandler {
@@ -50,6 +52,7 @@ public final class PartyOperationHandler extends AbstractMaplePacketHandler {
party = world.createParty(partyplayer);
player.setParty(party);
player.setMPC(partyplayer);
player.getMap().addPartyMember(player);
player.silentPartyUpdate();
c.announce(MaplePacketCreator.partyCreated(partyplayer));
} else {
@@ -59,17 +62,22 @@ public final class PartyOperationHandler extends AbstractMaplePacketHandler {
}
case 2: {
if (party != null && partyplayer != null) {
if (partyplayer.equals(party.getLeader())) {
world.updateParty(party.getId(), PartyOperation.DISBAND, partyplayer);
if (player.getEventInstance() != null) {
player.getEventInstance().disbandParty();
}
} else {
world.updateParty(party.getId(), PartyOperation.LEAVE, partyplayer);
if (player.getEventInstance() != null) {
player.getEventInstance().leftParty(player);
}
if (partyplayer.getId() == party.getLeaderId()) {
c.getWorldServer().removeMapPartyMembers(party.getId());
world.updateParty(party.getId(), PartyOperation.DISBAND, partyplayer);
if (player.getEventInstance() != null) {
player.getEventInstance().disbandParty();
}
} else {
player.getMap().removePartyMember(player);
world.updateParty(party.getId(), PartyOperation.LEAVE, partyplayer);
if (player.getEventInstance() != null) {
player.getEventInstance().leftParty(player);
}
}
player.setParty(null);
}
break;
@@ -81,6 +89,8 @@ public final class PartyOperationHandler extends AbstractMaplePacketHandler {
if (party != null) {
if (party.getMembers().size() < 6) {
partyplayer = new MaplePartyCharacter(player);
player.getMap().addPartyMember(player);
world.updateParty(party.getId(), PartyOperation.JOIN, partyplayer);
player.receivePartyMemberHP();
player.updatePartyMemberHP();
@@ -109,6 +119,7 @@ public final class PartyOperationHandler extends AbstractMaplePacketHandler {
party = world.createParty(partyplayer);
player.setParty(party);
player.setMPC(partyplayer);
player.getMap().addPartyMember(player);
c.announce(MaplePacketCreator.partyCreated(partyplayer));
}
if (party.getMembers().size() < 6) {
@@ -129,12 +140,20 @@ public final class PartyOperationHandler extends AbstractMaplePacketHandler {
if (partyplayer.equals(party.getLeader())) {
MaplePartyCharacter expelled = party.getMemberById(cid);
if (expelled != null) {
world.updateParty(party.getId(), PartyOperation.EXPEL, expelled);
if (player.getEventInstance() != null) {
if (expelled.isOnline()) {
player.getEventInstance().disbandParty();
MapleCharacter emc = expelled.getPlayer();
if(emc != null) {
MapleMap map = emc.getMap();
if(map != null) map.removePartyMember(emc);
EventInstanceManager eim = emc.getEventInstance();
if(eim != null) {
eim.leftParty(emc);
}
emc.setParty(null);
}
world.updateParty(party.getId(), PartyOperation.EXPEL, expelled);
}
}
break;

1
src/net/server/channel/handlers/PlayerLoggedinHandler.java
View File

@@ -263,6 +263,7 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler {
player.changeSkillLevel(SkillFactory.getSkill(10000000 * player.getJobType() + 12), (byte) (player.getLinkedLevel() / 10), 20, -1);
player.checkBerserk(player.isHidden());
player.buffExpireTask();
player.diseaseExpireTask();
player.skillCooldownTask();
player.expirationTask();
if (GameConstants.hasSPTable(player.getJob()) && player.getJob().getId() != 2001) {

108
src/net/server/world/MapleParty.java
View File

@@ -29,17 +29,21 @@ import java.util.HashMap;
import java.util.Map.Entry;
import java.util.Map;
import java.util.Comparator;
import java.util.concurrent.locks.ReentrantLock;
import java.util.concurrent.locks.Lock;
public class MapleParty {
private int id;
private int leaderId;
private List<MaplePartyCharacter> members = new LinkedList<MaplePartyCharacter>();
private List<MaplePartyCharacter> members = new LinkedList<>();
private List<MaplePartyCharacter> pqMembers = null;
private Map<Integer, Integer> histMembers = new HashMap<>();
private int nextEntry = 0;
private int id;
private Lock lock = new ReentrantLock();
public MapleParty(int id, MaplePartyCharacter chrfor) {
this.leaderId = chrfor.getId();
this.members.add(chrfor);
@@ -47,20 +51,35 @@ public class MapleParty {
}
public boolean containsMembers(MaplePartyCharacter member) {
return members.contains(member);
lock.lock();
try {
return members.contains(member);
} finally {
lock.unlock();
}
}
public void addMember(MaplePartyCharacter member) {
histMembers.put(member.getId(), nextEntry);
nextEntry++;
members.add(member);
lock.lock();
try {
histMembers.put(member.getId(), nextEntry);
nextEntry++;
members.add(member);
} finally {
lock.unlock();
}
}
public void removeMember(MaplePartyCharacter member) {
histMembers.remove(member.getId());
members.remove(member);
lock.lock();
try {
histMembers.remove(member.getId());
members.remove(member);
} finally {
lock.unlock();
}
}
public void setLeader(MaplePartyCharacter victim) {
@@ -68,28 +87,48 @@ public class MapleParty {
}
public void updateMember(MaplePartyCharacter member) {
for (int i = 0; i < members.size(); i++) {
if (members.get(i).getId() == member.getId()) {
members.set(i, member);
lock.lock();
try {
for (int i = 0; i < members.size(); i++) {
if (members.get(i).getId() == member.getId()) {
members.set(i, member);
}
}
} finally {
lock.unlock();
}
}
public MaplePartyCharacter getMemberById(int id) {
for (MaplePartyCharacter chr : members) {
if (chr.getId() == id) {
return chr;
lock.lock();
try {
for (MaplePartyCharacter chr : members) {
if (chr.getId() == id) {
return chr;
}
}
return null;
} finally {
lock.unlock();
}
return null;
}
public Collection<MaplePartyCharacter> getMembers() {
return Collections.unmodifiableList(members);
lock.lock();
try {
return Collections.unmodifiableList(members);
} finally {
lock.unlock();
}
}
public List<MaplePartyCharacter> getPartyMembers() {
return members;
lock.lock();
try {
return Collections.unmodifiableList(members);
} finally {
lock.unlock();
}
}
// used whenever entering PQs: will draw every party member that can attempt a target PQ while ingnoring those unfit.
@@ -114,17 +153,30 @@ public class MapleParty {
}
public MaplePartyCharacter getLeader() {
for(MaplePartyCharacter mpc: members) {
if(mpc.getId() == leaderId) {
return mpc;
lock.lock();
try {
for(MaplePartyCharacter mpc: members) {
if(mpc.getId() == leaderId) {
return mpc;
}
}
return null;
} finally {
lock.unlock();
}
return null;
}
public byte getPartyDoor(int cid) {
List<Entry<Integer, Integer>> histList = new LinkedList<>(histMembers.entrySet());
List<Entry<Integer, Integer>> histList;
lock.lock();
try {
histList = new LinkedList<>(histMembers.entrySet());
} finally {
lock.unlock();
}
Collections.sort(histList, new Comparator<Entry<Integer, Integer>>()
{
@Override
@@ -133,13 +185,13 @@ public class MapleParty {
return ( o1.getValue() ).compareTo( o2.getValue() );
}
});
byte slot = 0;
for(Entry<Integer, Integer> e: histList) {
if(e.getKey() == cid) break;
slot++;
}
return slot;
}

35
src/net/server/world/World.java
View File

@@ -45,8 +45,10 @@ import java.util.Set;
import java.util.HashSet;
import java.util.concurrent.ScheduledFuture;
import scripting.event.EventInstanceManager;
import server.TimerManager;
import server.maps.MapleHiredMerchant;
import server.maps.MapleMap;
import server.MaplePlayerShop;
import net.server.worker.CharacterAutosaverWorker;
import net.server.worker.MountTirednessWorker;
@@ -357,16 +359,22 @@ public class World {
public MapleParty createParty(MaplePartyCharacter chrfor) {
int partyid = runningPartyId.getAndIncrement();
MapleParty party = new MapleParty(partyid, chrfor);
parties.put(party.getId(), party);
synchronized(parties) {
parties.put(party.getId(), party);
}
return party;
}
public MapleParty getParty(int partyid) {
return parties.get(partyid);
synchronized(parties) {
return parties.get(partyid);
}
}
public MapleParty disbandParty(int partyid) {
return parties.remove(partyid);
synchronized(parties) {
return parties.remove(partyid);
}
}
public void updateParty(MapleParty party, PartyOperation operation, MaplePartyCharacter target) {
@@ -419,8 +427,10 @@ public class World {
break;
case CHANGE_LEADER:
MapleCharacter mc = party.getLeader().getPlayer();
if(mc.getEventInstance() != null && mc.getEventInstance().isEventLeader(mc)) {
mc.getEventInstance().changedLeader(target.getPlayer());
EventInstanceManager eim = mc.getEventInstance();
if(eim != null && eim.isEventLeader(mc)) {
eim.changedLeader(target.getPlayer());
}
party.setLeader(target);
break;
@@ -430,6 +440,21 @@ public class World {
updateParty(party, operation, target);
}
public void removeMapPartyMembers(int partyid) {
MapleParty party = getParty(partyid);
if(party == null) return;
for(MaplePartyCharacter mpc : party.getMembers()) {
MapleCharacter mc = mpc.getPlayer();
if(mc != null) {
MapleMap map = mc.getMap();
if(map != null) {
map.removeParty(partyid);
}
}
}
}
public int find(String name) {
int channel = -1;
MapleCharacter chr = getPlayerStorage().getCharacterByName(name);