Merge branch 'refs/heads/master' into feat/postgresql-database

# Conflicts:
#	src/main/java/server/life/MonsterInformationProvider.java
#	src/main/java/server/maps/MapleMap.java
This commit is contained in:
P0nk
2024-09-03 17:45:27 +02:00

View File

@@ -1442,6 +1442,8 @@ public class MapleMap {
monster.dispatchMonsterKilled(true);
broadcastMessage(PacketCreator.killMonster(monster.getObjectId(), animation), monster.getPosition());
}
}
public void killFriendlies(Monster mob) {