projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-10 00:13:42 -04:00
Code Issues Projects Releases Wiki Activity

Merged in M4SS/holocore/broadcast-scripts-refactor (pull request #84)

Browse Source 
Broadcast scripts refactor
This commit is contained in:
Obique PSWG
2015-10-09 12:00:27 -05:00
parent 5514da7736 f5d8eeaa70
commit 6a8eb3bc89
5 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/commands/generic/cmdBroadcast.js
+1 -3
View File
@@ -1,5 +1,3 @@
function executeCommand(galacticManager, player, target, args) {
var ChatBroadcastIntent = Java.type("intents.chat.ChatBroadcastIntent");
var BroadcastType = Java.type("intents.chat.ChatBroadcastIntent.BroadcastType");
new ChatBroadcastIntent(args, player, player.getCreatureObject().getLocation().getTerrain(), BroadcastType.PLANET).broadcast();
intentFactory.broadcastPlanet(player.getCreatureObject().getLocation().getTerrain(), args);
}
scripts/commands/generic/cmdBroadcastArea.js
+1 -3
View File
@@ -1,5 +1,3 @@
function executeCommand(galacticManager, player, target, args) {
var ChatBroadcastIntent = Java.type("intents.chat.ChatBroadcastIntent");
var BroadcastType = Java.type("intents.chat.ChatBroadcastIntent.BroadcastType");
new ChatBroadcastIntent(args, player, player.getCreatureObject().getLocation().getTerrain(), BroadcastType.AREA).broadcast();
intentFactory.broadcastArea(args, player);
}
scripts/commands/generic/cmdBroadcastGalaxy.js
+1 -3
View File
@@ -1,5 +1,3 @@
function executeCommand(galacticManager, player, target, args) {
var ChatBroadcastIntent = Java.type("intents.chat.ChatBroadcastIntent");
var BroadcastType = Java.type("intents.chat.ChatBroadcastIntent.BroadcastType");
new ChatBroadcastIntent(args, player, player.getCreatureObject().getLocation().getTerrain(), BroadcastType.GALAXY).broadcast();
intentFactory.broadcastGalaxy(args, player);
}
scripts/commands/generic/cmdBroadcastPlanet.js
+1 -3
View File
@@ -1,5 +1,3 @@
function executeCommand(galacticManager, player, target, args) {
var ChatBroadcastIntent = Java.type("intents.chat.ChatBroadcastIntent");
var BroadcastType = Java.type("intents.chat.ChatBroadcastIntent.BroadcastType");
new ChatBroadcastIntent(args, player, player.getCreatureObject().getLocation().getTerrain(), BroadcastType.PLANET).broadcast();
intentFactory.broadcastPlanet(player.getCreatureObject().getLocation().getTerrain(), args);
}
src/utilities/IntentFactory.java
+3 -2
View File
@@ -37,9 +37,10 @@ public final class IntentFactory {
/**
* Sends a system message to the entire galaxy.
* @param message System message to broadcast.
* @param source The source of this system message.
*/
public void broadcastGalaxy(String message) {
broadcast(message, null, BroadcastType.GALAXY);
public void broadcastGalaxy(String message, Player source) {
broadcast(message, source, BroadcastType.GALAXY);
}
/**