Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed Object[] data

master
melvin 2012-08-30 21:39:18 +08:00
parent 502f56034e
commit d76bd5d422
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/magic/card/Goblin_Marshal.java
View File

@ -18,7 +18,6 @@ public class Goblin_Marshal {
return new MagicEvent( return new MagicEvent(
permanent, permanent,
player, player,
new Object[]{player},
this, this,
player + " puts two 1/1 red Goblin creature tokens onto the battlefield."); player + " puts two 1/1 red Goblin creature tokens onto the battlefield.");
} }
@ -28,7 +27,7 @@ public class Goblin_Marshal {
final MagicEvent event, final MagicEvent event,
final Object data[], final Object data[],
final Object[] choiceResults) { final Object[] choiceResults) {
final MagicPlayer player = (MagicPlayer)data[0]; final MagicPlayer player = event.getPlayer();
game.doAction(new MagicPlayTokenAction( game.doAction(new MagicPlayTokenAction(
player, player,
TokenCardDefinitions.get("Goblin1"))); TokenCardDefinitions.get("Goblin1")));
@ -46,7 +45,6 @@ public class Goblin_Marshal {
new MagicEvent( new MagicEvent(
permanent, permanent,
player, player,
new Object[]{player},
this, this,
player + " puts two 1/1 red Goblin creature tokens onto the battlefield.") : player + " puts two 1/1 red Goblin creature tokens onto the battlefield.") :
MagicEvent.NONE; MagicEvent.NONE;
@ -57,7 +55,7 @@ public class Goblin_Marshal {
final MagicEvent event, final MagicEvent event,
final Object data[], final Object data[],
final Object[] choiceResults) { final Object[] choiceResults) {
final MagicPlayer player = (MagicPlayer)data[0]; final MagicPlayer player = event.getPlayer();
game.doAction(new MagicPlayTokenAction( game.doAction(new MagicPlayTokenAction(
player, player,
TokenCardDefinitions.get("Goblin1"))); TokenCardDefinitions.get("Goblin1")));