External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 12:31:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into Network_Upgrade

Browse source 
Conflicts:
	Mage.Client/src/main/java/mage/client/chat/ChatPanel.java
	Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
	Mage.Client/src/main/java/mage/client/table/TablesPanel.java
	Mage.Common/src/mage/remote/SessionImpl.java
	Mage.Server/src/main/java/mage/server/Session.java
This commit is contained in:
betasteward 2015-06-20 23:00:34 -04:00
commit f4aff4a121
894 changed files with 23817 additions and 4981 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Server.Console/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
</parent>
<groupId>org.mage</groupId>

8
Mage.Server.Console/src/main/java/mage/server/console/ConsolePanel.java
View file

@ -94,10 +94,10 @@ public class ConsolePanel extends javax.swing.JPanel {
public void start() {
updateUsersTask = new UpdateUsersTask(ConsoleFrame.getClient(), this);
updateTablesTask = new UpdateTablesTask(ConsoleFrame.getClient(), ConsoleFrame.getClient().getMainRoomId(), this);
updateUsersTask.execute();
updateTablesTask.execute();
// updateUsersTask = new UpdateUsersTask(ConsoleFrame.getClient(), this);
// updateTablesTask = new UpdateTablesTask(ConsoleFrame.getClient(), ConsoleFrame.getClient().getMainRoomId(), this);
// updateUsersTask.execute();
// updateTablesTask.execute();
}
public void stop() {