diff --git a/scripts/commands/inspire.py b/scripts/commands/inspire.py index e2924682..8e820c1f 100644 --- a/scripts/commands/inspire.py +++ b/scripts/commands/inspire.py @@ -13,15 +13,15 @@ def run(core, actor, target, commandString): print 'x' if actor.getPosture() != 0x09: - actor.sendSystemMessage('@performance:insp_buff_must_perform') + actor.sendSystemMessage('@performance:insp_buff_must_perform', 2) return - if (target.getPerformanceWatchee() != actor): + if target.getPerformanceWatchee() != actor: if actor.getPerformanceType(): - actor.sendSystemMessage('@performance:insp_buff_must_watch') + actor.sendSystemMessage('@performance:insp_buff_must_watch', 2) return else: - actor.sendSystemMessage('@performance:insp_buff_must_listen') + actor.sendSystemMessage('@performance:insp_buff_must_listen', 2) return print ('Buffing Player: ' + str(target.getObjectId()) + ' or: ' + target.getCustomName()) diff --git a/src/resources/common/PlayerFlags.java b/src/resources/datatables/PlayerFlags.java similarity index 97% rename from src/resources/common/PlayerFlags.java rename to src/resources/datatables/PlayerFlags.java index 897659d7..309f465e 100644 --- a/src/resources/common/PlayerFlags.java +++ b/src/resources/datatables/PlayerFlags.java @@ -19,7 +19,7 @@ * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination. ******************************************************************************/ -package resources.common; +package resources.datatables; public class PlayerFlags { public static final int LFG = 0x01; diff --git a/src/services/ConnectionService.java b/src/services/ConnectionService.java index e201ad73..18ac17e1 100644 --- a/src/services/ConnectionService.java +++ b/src/services/ConnectionService.java @@ -53,6 +53,7 @@ import engine.resources.service.INetworkDispatch; import engine.resources.service.INetworkRemoteEvent; import resources.common.*; import resources.common.collidables.AbstractCollidable; +import resources.datatables.PlayerFlags; import resources.objects.creature.CreatureObject; import resources.objects.player.PlayerObject; diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java index af2ba420..eff8e68a 100644 --- a/src/services/SimulationService.java +++ b/src/services/SimulationService.java @@ -79,6 +79,7 @@ import resources.objects.player.PlayerObject; import resources.objects.tangible.TangibleObject; import resources.common.*; import resources.common.collidables.AbstractCollidable; +import resources.datatables.PlayerFlags; import services.ai.LairActor; import toxi.geom.Line3D; import toxi.geom.Ray3D; diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java index 53f357fe..6b2c608c 100644 --- a/src/services/object/ObjectService.java +++ b/src/services/object/ObjectService.java @@ -44,6 +44,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import resources.common.*; +import resources.datatables.PlayerFlags; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.session.IoSession;