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

cast to more general MagicMappable instead of MagicTarget

master
melvin 2011-07-01 11:43:06 +08:00
parent d1fd5879ba
commit 40943667a9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/magic/model/event/MagicEvent.java
View File

@ -9,6 +9,7 @@ import magic.model.MagicGame;
import magic.model.MagicMessage; import magic.model.MagicMessage;
import magic.model.MagicPlayer; import magic.model.MagicPlayer;
import magic.model.MagicSource; import magic.model.MagicSource;
import magic.model.MagicMappable;
import magic.model.choice.MagicChoice; import magic.model.choice.MagicChoice;
import magic.model.choice.MagicPayManaCostResult; import magic.model.choice.MagicPayManaCostResult;
import magic.model.choice.MagicTargetChoice; import magic.model.choice.MagicTargetChoice;
@ -198,13 +199,13 @@ public class MagicEvent implements MagicCopyable {
(source != null ? source.getId() : -1L), (source != null ? source.getId() : -1L),
(action != null ? action.hashCode() : -1L), (action != null ? action.hashCode() : -1L),
(data.length > 0 && data[0] != null) ? (data.length > 0 && data[0] != null) ?
((data[0] instanceof MagicTarget) ? ((MagicTarget)data[0]).getId() : data[0].hashCode()) : ((data[0] instanceof MagicMappable) ? ((MagicMappable)data[0]).getId() : data[0].hashCode()) :
-1L, -1L,
(data.length > 1 && data[1] != null) ? (data.length > 1 && data[1] != null) ?
((data[1] instanceof MagicTarget) ? ((MagicTarget)data[1]).getId() : data[1].hashCode()) : ((data[1] instanceof MagicMappable) ? ((MagicMappable)data[1]).getId() : data[1].hashCode()) :
-1L, -1L,
(data.length > 2 && data[2] != null) ? (data.length > 2 && data[2] != null) ?
((data[2] instanceof MagicTarget) ? ((MagicTarget)data[2]).getId() : data[2].hashCode()) : ((data[2] instanceof MagicMappable) ? ((MagicMappable)data[2]).getId() : data[2].hashCode()) :
-1L, -1L,
}; };
return magic.MurmurHash3.hash(keys); return magic.MurmurHash3.hash(keys);