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

# Conflicts:
#	src/main/java/server/life/MonsterInformationProvider.java
#	src/main/java/server/maps/MapleMap.java

src/main/java/server/maps/MapleMap.java

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