projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-01-17 00:06:00 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of http://37.59.100.124:7990/scm/nge/core3

Browse Source
This commit is contained in:
Obique
2015-01-23 13:57:29 -06:00
committed by Obique
parent d4f52329ff 273562a704
commit 7a682af45a
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/commands/generic/cmdTip.py Normal file
View File

@@ -0,0 +1,4 @@
import sys
def execute(objManager, player, target, args):
return

9
src/resources/objects/creature/CreatureObject.java
View File

@@ -222,6 +222,7 @@ public class CreatureObject extends TangibleObject {
public void setPosture(Posture posture) {
this.posture = posture;
sendDelta(3, 14, posture);
}
public void setRace(Race race) {
@@ -230,10 +231,12 @@ public class CreatureObject extends TangibleObject {
public void setCashBalance(int cashBalance) {
this.cashBalance = cashBalance;
sendDelta(1, 0, cashBalance);
}
public void setBankBalance(int bankBalance) {
this.bankBalance = bankBalance;
sendDelta(1, 1, bankBalance);
}
public void setUnmodifiedMaxAtributes(int unmodifiedMaxAtributes) {
@@ -290,6 +293,7 @@ public class CreatureObject extends TangibleObject {
public void setHeight(double height) {
this.height = height;
sendDelta(3, 17, height);
}
public void setPerformanceType(int performanceType) {
@@ -437,7 +441,7 @@ public class CreatureObject extends TangibleObject {
}
public void createBaseline3(Player target, BaselineBuilder bb) {
super.createBaseline3(target, bb);
super.createBaseline3(target, bb); // 13 variables - TANO3 (9) + BASE3 (4)
bb.addByte(posture.getId());
bb.addByte(0); // Faction Rank
bb.addLong(0); // Owner - mainly used for pets and vehicles
@@ -514,4 +518,7 @@ public class CreatureObject extends TangibleObject {
super.createBaseline9(target, bb);
}
public void sendDelta(int type, int update, Object value) {
sendDelta(BaselineType.CREO, type, update, value);
}
}

2
src/services/objects/ObjectManager.java
View File

@@ -34,6 +34,7 @@ import resources.objects.creature.CreatureObject;
import resources.objects.quadtree.QuadTree;
import resources.player.Player;
import resources.player.PlayerEvent;
import resources.player.PlayerState;
import resources.server_info.CachedObjectDatabase;
import resources.server_info.ObjectDatabase;
import resources.server_info.ObjectDatabase.Traverser;
@@ -300,6 +301,7 @@ public class ObjectManager extends Manager {
creature.createObject(player);
creature.clearAware();
updateAwarenessForObject(creature);
player.setPlayerState(PlayerState.ZONED_IN);
System.out.println("[" + player.getUsername() + "] " + player.getCharacterName() + " is zoning in");
new PlayerEventIntent(player, galaxy, PlayerEvent.PE_ZONE_IN).broadcast();
}