Fixes, added game roles, commands in mcchat, smaller additions #26

Merged
NorbiPeti merged 10 commits from dev into master 2017-04-15 12:02:57 +00:00
6 changed files with 13 additions and 11 deletions
Showing only changes of commit e7963e4f9a - Show all commits

View file

@ -11,11 +11,8 @@ public class DiscordPlayer extends ChromaGamerBase {
}
public String getDiscordID() {
return did;
}
@Override
public String getFileName() {
if (did == null)
did = plugindata.getString(getFolder() + "_id");
return did;
}
}

View file

@ -131,6 +131,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
Bukkit.getPluginManager().registerEvents(new ExceptionListener(), this);
TBMCCoreAPI.RegisterEventsForExceptions(new MCListener(), this);
TBMCChatAPI.AddCommands(this, DiscordMCCommandBase.class);
TBMCCoreAPI.RegisterUserClass(DiscordPlayer.class);
new Thread(() -> AnnouncementGetterThreadMethod()).start();
setupProviders();
TBMCCoreAPI.SendUnsentExceptions();

View file

@ -21,6 +21,8 @@ public class CommandListener {
final IChannel channel = event.getMessage().getChannel();
if (!channel.getID().equals(DiscordPlugin.botchannel.getID()) && !channel.isPrivate())
return;
if (channel.getID().equals(DiscordPlugin.chatchannel.getID()))
return; // The chat code already handles this - Right now while testing botchannel is the same as chatchannel
runCommand(event.getMessage(), true);
}
}, new IListener<MessageReceivedEvent>() {

View file

@ -98,7 +98,7 @@ public class MCChatListener implements Listener, IListener<MessageReceivedEvent>
TBMCPlayer p = dp.getAs(TBMCPlayer.class);
if (!UnconnectedSenders.containsKey(author.getID()))
UnconnectedSenders.put(author.getID(), new DiscordSender(author, event.getMessage().getChannel(),
p == null ? null : p.getPlayerName())); // Display the playername, if found
p == null ? null : p.PlayerName().get())); // Display the playername, if found
dsender = UnconnectedSenders.get(author.getID());
}

View file

@ -43,6 +43,9 @@ public class MCListener implements Listener {
if (DiscordPlugin.SafeMode)
return;
DiscordPlayer dp = e.getPlayer().getAs(DiscordPlayer.class);
/*System.out.println("dp: " + dp);
if (dp != null)
System.out.println("dp.did: " + dp.getDiscordID());*/
if (dp == null || dp.getDiscordID() == null || dp.getDiscordID() == "")
return;
IUser user = DiscordPlugin.dc.getUserByID(dp.getDiscordID());
@ -73,8 +76,7 @@ public class MCListener implements Listener {
DiscordPlugin.Restart = !e.getCommand().equalsIgnoreCase("stop"); // The variable is always true except if stopped
}
/*@EventHandler
public void onPlayerMute(MuteStatusChangeEvent e) {
e.getAffected()
}*/
/*
* @EventHandler public void onPlayerMute(MuteStatusChangeEvent e) { e.getAffected() }
*/
}

View file

@ -46,7 +46,7 @@ public class AcceptMCCommand extends DiscordMCCommandBase {
}
DiscordPlayer dp = ChromaGamerBase.getUser(did, DiscordPlayer.class);
TBMCPlayer mcp = TBMCPlayerBase.getPlayer(((Player) sender).getUniqueId(), TBMCPlayer.class);
dp.connectWith(mcp); // TODO: Fix null.yml and empty playerinfos
dp.connectWith(mcp);
dp.save();
mcp.save();
ConnectCommand.WaitingToConnect.remove(sender.getName());