projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-04 19:12:50 -04:00
Code Issues Projects Releases Wiki Activity

temp fix for /pvp bug, fixed null pointer on buffing ai

Browse Source
This commit is contained in:
Light2
2014-03-30 00:54:09 +01:00
parent 26053c7baa
commit a6d91379fe
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureMessageBuilder.java
+13 -4
View File
@@ -362,8 +362,11 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder {
PlayerObject player = (PlayerObject) creature.getSlottedObject("ghost");
for(Buff buff : creature.getBuffList().get()) {
buff.setTotalPlayTime((int) (player.getTotalPlayTime() + (System.currentTimeMillis() - player.getLastPlayTimeUpdate()) / 1000));
if(player != null)
buff.setTotalPlayTime((int) (player.getTotalPlayTime() + (System.currentTimeMillis() - player.getLastPlayTimeUpdate()) / 1000));
else
buff.setTotalPlayTime(0);
buffer.put((byte) 1);
buffer.putInt(0);
buffer.putInt(CRC.StringtoCRC(buff.getBuffName()));
@@ -777,7 +780,10 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder {
IoBuffer buffer = bufferPool.allocate(37, false).order(ByteOrder.LITTLE_ENDIAN);
buffer.putInt(1);
buffer.putInt(creature.getBuffListCounter());
buff.setTotalPlayTime((int) (player.getTotalPlayTime() + (System.currentTimeMillis() - player.getLastPlayTimeUpdate()) / 1000));
if(player != null)
buff.setTotalPlayTime((int) (player.getTotalPlayTime() + (System.currentTimeMillis() - player.getLastPlayTimeUpdate()) / 1000));
else
buff.setTotalPlayTime(0);
buffer.put((byte) 0);
buffer.put(buff.getBytes());
int size = buffer.position();
@@ -813,7 +819,10 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder {
IoBuffer buffer = bufferPool.allocate(37, false).order(ByteOrder.LITTLE_ENDIAN);
buffer.putInt(1);
buffer.putInt(creature.getBuffListCounter());
buff.setTotalPlayTime((int) (player.getTotalPlayTime() + (System.currentTimeMillis() - player.getLastPlayTimeUpdate()) / 1000));
if(player != null)
buff.setTotalPlayTime((int) (player.getTotalPlayTime() + (System.currentTimeMillis() - player.getLastPlayTimeUpdate()) / 1000));
else
buff.setTotalPlayTime(0);
buffer.put((byte) 2);
buffer.put(buff.getBytes());
int size = buffer.position();