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

Using Java ThreadPool + Mob Skills & Event Instance patch + Eqp Merge

Browse Source 
Server source now uses Java ThreadPool, recycling used thread resources for next uses.
Added Grenade visual effect for other players.
Implemented an attempt towards unsynced mob behavior, where reportedly players were able to pin same mob in different sections of the map.
Solved several deadlock issues, mostly regarding character synchronized methods, event instance scripts and player/item vision-unvision.
Solved an issue where mobs would not cast some skills of it's skillset. Frequent behavior on low-leveled mobs.
Fixed a bug on 2nd Maker quest where players could complete it by merely disassembling an equipment.
New custom mechanic: equipment merge. Similarly to the Bazaar NPC, every equipment after the selected one is used up, and a fraction of their stat amounts are used as stat gains on the currently equipped items. If restrictions are enabled, players must be high-leveled and Maker lv3 to use it.
Skill Storm Break no longer uses up arrows.
Added a server flag to allow access for all Aran job skills from the beginning.
Implemented Battleship and Super Transformation questline scripts.
Fixed a desynchronization within pet position and cash inventory position, that could potentially lead to some inventory issues until relogin.
Improved timestamp handling in some handler classes. Spam detection is entirely a server-side matter, hence removed usage of client-sided timestamp content.
Refactored some pet response packets, improving some of their behaviors.
Fixed some quest issues: Maker lv1 and Omega Sector meteorite one.
This commit is contained in:
ronancpl
2018-11-10 17:48:35 -02:00
parent 00675ab95d
commit 5ee0cd1c98
120 changed files with 7424 additions and 6387 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/MapleItemInformationProvider.java
+6 -4
View File
@@ -646,7 +646,7 @@ public class MapleItemInformationProvider {
}
public static boolean rollSuccessChance(double prop) {
return Math.random() > testYourLuck(prop / 100.0, ServerConstants.SCROLL_CHANCE_RATE);
return Math.random() >= testYourLuck(prop / 100.0, ServerConstants.SCROLL_CHANCE_RATE);
}
private static short getMaximumShortMaxIfOverflow(int value1, int value2) {
@@ -1238,9 +1238,11 @@ public class MapleItemInformationProvider {
boolean bRestricted = false;
if(itemId != 0) {
MapleData data = getItemData(itemId);
bRestricted = MapleDataTool.getIntConvert("info/tradeBlock", data, 0) == 1;
if (!bRestricted) {
bRestricted = MapleDataTool.getIntConvert("info/accountSharable", data, 0) == 1;
if (data != null) {
bRestricted = MapleDataTool.getIntConvert("info/tradeBlock", data, 0) == 1;
if (!bRestricted) {
bRestricted = MapleDataTool.getIntConvert("info/accountSharable", data, 0) == 1;
}
}
}
src/server/ThreadManager.java
+72
View File
@@ -0,0 +1,72 @@
/*
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation version 3 as published by
the Free Software Foundation. You may not use, modify or distribute
this program under any other version of the GNU Affero General Public
License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package server;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.Executors;
import java.util.concurrent.RejectedExecutionHandler;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
/**
*
* @author Ronan
*/
public class ThreadManager {
private static ThreadManager instance = new ThreadManager();
public static ThreadManager getInstance() {
return instance;
}
private ThreadPoolExecutor tpe;
private ThreadManager() {}
private class RejectedExecutionHandlerImpl implements RejectedExecutionHandler {
@Override
public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) {
Thread t = new Thread(r);
t.start();
}
}
public void newTask(Runnable r) {
tpe.execute(r);
}
public void start() {
RejectedExecutionHandler reh = new RejectedExecutionHandlerImpl();
ThreadFactory tf = Executors.defaultThreadFactory();
tpe = new ThreadPoolExecutor(20, 1000, 77, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(50), tf, reh);
}
public void stop() {
tpe.shutdown();
try {
tpe.awaitTermination(5, TimeUnit.MINUTES);
} catch (InterruptedException ie) {}
}
}
src/server/life/MapleMonster.java
+59 -28
View File
@@ -573,15 +573,28 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
}
private void removeController() {
this.lockMonster();
try {
MapleCharacter chrController = getController();
if (chrController != null) { // this can/should only happen when a hidden gm attacks the monster
chrController.announce(MaplePacketCreator.stopControllingMonster(this.getObjectId()));
chrController.stopControllingMonster(this);
}
setController(null);
setControllerHasAggro(false);
setControllerKnowsAboutAggro(false);
} finally {
this.unlockMonster();
}
}
public MapleCharacter killBy(final MapleCharacter killer) {
distributeExperience(killer != null ? killer.getId() : 0);
MapleCharacter chrController = getController();
if (chrController != null) { // this can/should only happen when a hidden gm attacks the monster
chrController.announce(MaplePacketCreator.stopControllingMonster(this.getObjectId()));
chrController.stopControllingMonster(this);
}
removeController();
final List<Integer> toSpawn = this.getRevives(); // this doesn't work (?)
if (toSpawn != null) {
final MapleMap reviveMap = map;
@@ -647,8 +660,9 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
}
for(int i = 8810017; i >= 8810010; i--)
for(int i = 8810017; i >= 8810010; i--) {
reviveMap.killMonster(reviveMap.getMonsterById(i), killer, true);
}
}
if(eim != null) {
@@ -787,20 +801,24 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
public void switchController(MapleCharacter newController, boolean immediateAggro) {
MapleCharacter controllers = getController();
if (controllers == newController) {
return;
this.lockMonster();
try {
MapleCharacter controllers = getController();
if (controllers == newController) {
return;
}
removeController();
newController.controlMonster(this, immediateAggro);
setController(newController);
if (immediateAggro) {
setControllerHasAggro(true);
}
setControllerKnowsAboutAggro(false);
} finally {
this.unlockMonster();
}
if (controllers != null) {
controllers.stopControllingMonster(this);
controllers.getClient().announce(MaplePacketCreator.stopControllingMonster(getObjectId()));
}
newController.controlMonster(this, immediateAggro);
setController(newController);
if (immediateAggro) {
setControllerHasAggro(true);
}
setControllerKnowsAboutAggro(false);
}
public void addListener(MonsterListener listener) {
@@ -863,20 +881,21 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
@Override
public void sendSpawnData(MapleClient c) {
if (!isAlive()) {
public void sendSpawnData(MapleClient client) {
if (hp.get() <= 0) { // mustn't monsterLock this function
return;
}
if (isFake()) {
c.announce(MaplePacketCreator.spawnFakeMonster(this, 0));
if (fake) {
client.announce(MaplePacketCreator.spawnFakeMonster(this, 0));
} else {
c.announce(MaplePacketCreator.spawnMonster(this, false));
client.announce(MaplePacketCreator.spawnMonster(this, false));
}
statiLock.lock();
try {
if (stati.size() > 0) {
for (final MonsterStatusEffect mse : this.stati.values()) {
c.announce(MaplePacketCreator.applyMonsterStatus(getObjectId(), mse, null));
client.announce(MaplePacketCreator.applyMonsterStatus(getObjectId(), mse, null));
}
}
} finally {
@@ -884,7 +903,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
if (hasBossHPBar()) {
c.announceBossHpBar(this, this.hashCode(), makeBossHPBarPacket());
client.announceBossHpBar(this, this.hashCode(), makeBossHPBarPacket());
}
}
@@ -1155,6 +1174,18 @@ public class MapleMonster extends AbstractLoadedMapleLife {
map.getChannelServer().registerMobStatus(map.getId(), effect, cancelTask, duration);
}
public void refreshMobPosition() {
updateMobPosition(getPosition());
}
public void updateMobPosition(Point newPoint) {
removeController();
setPosition(newPoint);
map.broadcastMessage(MaplePacketCreator.moveMonster(this.getObjectId(), false, -1, 0, 0, 0, this.getPosition(), this.getIdleMovement()));
map.moveMonster(this, this.getPosition());
map.updateMonsterController(this);
}
private void debuffMobStat(MonsterStatus stat) {
statiLock.lock();
src/server/life/MapleNPC.java
+2 -6
View File
@@ -44,12 +44,8 @@ public class MapleNPC extends AbstractLoadedMapleLife {
@Override
public void sendSpawnData(MapleClient client) {
if (this.getId() > 9010010 && this.getId() < 9010014) {
client.announce(MaplePacketCreator.spawnNPCRequestController(this, false));
} else {
client.announce(MaplePacketCreator.spawnNPC(this));
client.announce(MaplePacketCreator.spawnNPCRequestController(this, true));
}
client.announce(MaplePacketCreator.spawnNPC(this));
client.announce(MaplePacketCreator.spawnNPCRequestController(this, true));
}
@Override
src/server/life/MobSkill.java
+2 -2
View File
@@ -103,12 +103,12 @@ public class MobSkill {
this.limit = limit;
}
public void applyDelayedEffect(final MapleCharacter player, final MapleMonster monster, final boolean skill, final List<MapleCharacter> banishPlayers, int animationTime) {
public void applyDelayedEffect(final MapleCharacter player, final MapleMonster monster, final boolean skill, int animationTime) {
Runnable toRun = new Runnable() {
@Override
public void run() {
if(monster.isAlive()) {
applyEffect(player, monster, skill, banishPlayers);
applyEffect(player, monster, skill, null);
}
}
};
src/server/maps/AbstractAnimatedMapleMapObject.java
+17
View File
@@ -21,18 +21,35 @@
*/
package server.maps;
import java.awt.Point;
import java.util.Collections;
import java.util.List;
import server.movement.AbsoluteLifeMovement;
import server.movement.LifeMovementFragment;
public abstract class AbstractAnimatedMapleMapObject extends AbstractMapleMapObject implements AnimatedMapleMapObject {
private int stance;
@Override
public int getStance() {
return stance;
}
@Override
public void setStance(int stance) {
this.stance = stance;
}
@Override
public boolean isFacingLeft() {
return Math.abs(stance) % 2 == 1;
}
public List<LifeMovementFragment> getIdleMovement() {
AbsoluteLifeMovement alm = new AbsoluteLifeMovement(0, getPosition(), 0, getStance());
alm.setPixelsPerSecond(new Point(0, 0));
List<LifeMovementFragment> moveUpdate = Collections.singletonList((LifeMovementFragment) alm);
return moveUpdate;
}
}
src/server/maps/MapleDoorObject.java
+12 -8
View File
@@ -25,6 +25,7 @@ import client.MapleCharacter;
import client.MapleClient;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReentrantReadWriteLock;
import net.server.world.MapleParty;
import tools.MaplePacketCreator;
/**
@@ -84,10 +85,9 @@ public class MapleDoorObject extends AbstractMapleMapObject {
}
public void warp(final MapleCharacter chr) {
boolean onParty = chr.getParty() != null;
if (chr.getId() == ownerId || (onParty && chr.getParty().getMemberById(ownerId) != null)) {
if(!inTown() && !onParty) {
MapleParty party = chr.getParty();
if (chr.getId() == ownerId || (party != null && party.getMemberById(ownerId) != null)) {
if(!inTown() && party == null) {
chr.changeMap(to, getLinkedPortalId());
} else {
chr.changeMap(to, getLinkedPortalPosition());
@@ -100,8 +100,10 @@ public class MapleDoorObject extends AbstractMapleMapObject {
@Override
public void sendSpawnData(MapleClient client) {
if (from.getId() == client.getPlayer().getMapId()) {
if (client.getPlayer().getParty() != null && (ownerId == client.getPlayer().getId() || client.getPlayer().getParty().getMemberById(ownerId) != null)) {
MapleCharacter chr = client.getPlayer();
if (from.getId() == chr.getMapId()) {
MapleParty party = chr.getParty();
if (party != null && (ownerId == chr.getId() || party.getMemberById(ownerId) != null)) {
client.announce(MaplePacketCreator.partyPortal(this.getFrom().getId(), this.getTo().getId(), this.toPosition()));
}
@@ -112,8 +114,10 @@ public class MapleDoorObject extends AbstractMapleMapObject {
@Override
public void sendDestroyData(MapleClient client) {
if (from.getId() == client.getPlayer().getMapId()) {
if (client.getPlayer().getParty() != null && (ownerId == client.getPlayer().getId() || client.getPlayer().getParty().getMemberById(ownerId) != null)) {
MapleCharacter chr = client.getPlayer();
if (from.getId() == chr.getMapId()) {
MapleParty party = chr.getParty();
if (party != null && (ownerId == chr.getId() || party.getMemberById(ownerId) != null)) {
client.announce(MaplePacketCreator.partyPortal(999999999, 999999999, new Point(-1, -1)));
}
client.announce(MaplePacketCreator.removeDoor(ownerId, inTown()));
src/server/maps/MapleDragon.java
+4 -4
View File
@@ -35,8 +35,8 @@ public class MapleDragon extends AbstractAnimatedMapleMapObject {
super();
this.owner = chr;
this.setPosition(chr.getPosition());
this.setStance(chr.getStance());
sendSpawnData(chr.getClient());
this.setStance(chr.getStance());
this.sendSpawnData(chr.getClient());
}
@Override
@@ -45,8 +45,8 @@ public class MapleDragon extends AbstractAnimatedMapleMapObject {
}
@Override
public void sendSpawnData(MapleClient c) {
c.announce(MaplePacketCreator.spawnDragon(this));
public void sendSpawnData(MapleClient client) {
client.announce(MaplePacketCreator.spawnDragon(this));
}
@Override
src/server/maps/MapleHiredMerchant.java
+4 -5
View File
@@ -645,15 +645,14 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
return mesos;
}
@Override
public void sendDestroyData(MapleClient client) {
}
@Override
public MapleMapObjectType getType() {
return MapleMapObjectType.HIRED_MERCHANT;
}
@Override
public void sendDestroyData(MapleClient client) {}
@Override
public void sendSpawnData(MapleClient client) {
client.announce(MaplePacketCreator.spawnHiredMerchantBox(this));
src/server/maps/MapleKite.java
-1
View File
@@ -3,7 +3,6 @@ package server.maps;
import java.awt.Point;
import client.MapleCharacter;
import client.MapleClient;
import constants.ServerConstants;
import tools.MaplePacketCreator;
public class MapleKite extends AbstractMapleMapObject {
src/server/maps/MapleMap.java
+33 -24
View File
@@ -1552,9 +1552,11 @@ public class MapleMap {
if (!monster.isAlive()) {
return;
}
if (monster.getController() != null) {
if (monster.getController().getMap() != this) {
monster.getController().stopControllingMonster(monster);
MapleCharacter chrController = monster.getController();
if (chrController != null) {
if (chrController.getMap() != this) {
chrController.stopControllingMonster(monster);
} else {
return;
}
@@ -1574,7 +1576,7 @@ public class MapleMap {
} finally {
chrRLock.unlock();
}
if (newController != null) {// was a new controller found? (if not no one is on the map)
if (newController != null) { // was a new controller found? (if not no one is on the map)
if (monster.isFirstAttack()) {
newController.controlMonster(monster, true);
monster.setControllerHasAggro(true);
@@ -1588,6 +1590,15 @@ public class MapleMap {
}
}
private Map<Integer, MapleMapObject> getCopyMapObjects() {
objectRLock.lock();
try {
return new HashMap<>(mapobjects);
} finally {
objectRLock.unlock();
}
}
public List<MapleMapObject> getMapObjects() {
objectRLock.lock();
try {
@@ -2340,14 +2351,14 @@ public class MapleMap {
if (onFirstUserEnter.length() != 0 && !chr.hasEntered(onFirstUserEnter, mapid) && MapScriptManager.getInstance().scriptExists(onFirstUserEnter, true)) {
chr.enteredScript(onFirstUserEnter, mapid);
MapScriptManager.getInstance().getMapScript(chr.getClient(), onFirstUserEnter, true);
MapScriptManager.getInstance().runMapScript(chr.getClient(), onFirstUserEnter, true);
}
}
if (onUserEnter.length() != 0) {
if (onUserEnter.equals("cygnusTest") && (mapid < 913040000 || mapid > 913040006)) {
chr.saveLocation("INTRO");
}
MapScriptManager.getInstance().getMapScript(chr.getClient(), onUserEnter, false);
MapScriptManager.getInstance().runMapScript(chr.getClient(), onUserEnter, false);
}
if (FieldLimit.CANNOTUSEMOUNTS.check(fieldLimit) && chr.getBuffedValue(MapleBuffStat.MONSTER_RIDING) != null) {
chr.cancelEffectFromBuffStat(MapleBuffStat.MONSTER_RIDING);
@@ -2629,10 +2640,15 @@ public class MapleMap {
}
for (MapleMonster monster : chr.getControlledMonsters()) {
monster.setController(null);
monster.setControllerHasAggro(false);
monster.setControllerKnowsAboutAggro(false);
updateMonsterController(monster);
monster.lockMonster();
try {
monster.setController(null);
monster.setControllerHasAggro(false);
monster.setControllerKnowsAboutAggro(false);
updateMonsterController(monster);
} finally {
monster.unlockMonster();
}
}
chr.leaveMap();
@@ -3042,7 +3058,7 @@ public class MapleMap {
}
private static void updateMapObjectVisibility(MapleCharacter chr, MapleMapObject mo) {
if (!chr.isMapObjectVisible(mo)) { // item entered view range
if (!chr.isMapObjectVisible(mo)) { // object entered view range
if (mo.getType() == MapleMapObjectType.SUMMON || mo.getPosition().distanceSq(chr.getPosition()) <= getRangedDistance()) {
chr.addVisibleMapObject(mo);
mo.sendSpawnData(chr.getClient());
@@ -3055,27 +3071,22 @@ public class MapleMap {
public void moveMonster(MapleMonster monster, Point reportedPos) {
monster.setPosition(reportedPos);
chrRLock.lock();
try {
for (MapleCharacter chr : characters) {
updateMapObjectVisibility(chr, monster);
}
} finally {
chrRLock.unlock();
for (MapleCharacter chr : getAllPlayers()) {
updateMapObjectVisibility(chr, monster);
}
}
public void movePlayer(MapleCharacter player, Point newPosition) {
player.setPosition(newPosition);
Collection<MapleMapObject> visibleObjects = player.getVisibleMapObjects();
objectRLock.lock();
try {
Collection<MapleMapObject> visibleObjects = player.getVisibleMapObjects();
MapleMapObject[] visibleObjectsNow = visibleObjects.toArray(new MapleMapObject[visibleObjects.size()]);
Map<Integer, MapleMapObject> mapObjects = getCopyMapObjects();
for (MapleMapObject mo : visibleObjectsNow) {
if (mo != null) {
if (mapobjects.get(mo.getObjectId()) == mo) {
if (mapObjects.get(mo.getObjectId()) == mo) {
updateMapObjectVisibility(player, mo);
} else {
player.removeVisibleMapObject(mo);
@@ -3084,8 +3095,6 @@ public class MapleMap {
}
} catch (Exception e) {
e.printStackTrace();
} finally {
objectRLock.unlock();
}
for (MapleMapObject mo : getMapObjectsInRange(player.getPosition(), getRangedDistance(), rangedMapobjectTypes)) {
src/server/maps/MapleSummon.java
+3 -2
View File
@@ -47,11 +47,12 @@ public class MapleSummon extends AbstractAnimatedMapleMapObject {
setPosition(pos);
}
@Override
public void sendSpawnData(MapleClient client) {
if (this != null) client.announce(MaplePacketCreator.spawnSummon(this, false));
client.announce(MaplePacketCreator.spawnSummon(this, false));
}
@Override
public void sendDestroyData(MapleClient client) {
client.announce(MaplePacketCreator.removeSummon(this, true));
}