lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync with L2jServer HighFive Jul 3rd 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-07-03 21:10:51 +00:00
parent 9c11f00722
commit ac006cde6a
29 changed files with 311 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/java/com/l2jserver/gameserver/data/sql/impl/AnnouncementsTable.java
View File

@@ -112,7 +112,9 @@ public final class AnnouncementsTable
{
if (announce.isValid() && (announce.getType() == type))
{
player.sendPacket(new CreatureSay(0, ChatType.ANNOUNCEMENT, player.getName(), announce.getContent()));
player.sendPacket(new CreatureSay(0, //
type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, //
player.getName(), announce.getContent()));
}
}
}

2
trunk/java/com/l2jserver/gameserver/data/sql/impl/SummonEffectsTable.java
View File

@@ -130,7 +130,7 @@ public class SummonEffectsTable
public void addPetEffect(int controlObjectId, Skill skill, int effectCurTime)
{
_petEffects.putIfAbsent(controlObjectId, new ArrayList<>()).add(new SummonEffect(skill, effectCurTime));
_petEffects.computeIfAbsent(controlObjectId, k -> new ArrayList<>()).add(new SummonEffect(skill, effectCurTime));
}
public boolean containsPetId(int controlObjectId)