Skip to content
This repository has been archived by the owner on Apr 3, 2022. It is now read-only.

Commit

Permalink
fix a bug that old bindcode isnt cleared after requesting a new one
Browse files Browse the repository at this point in the history
  • Loading branch information
@MCUmbrella
MCUmbrella committed Nov 10, 2021
1 parent 0c89a64 commit 1d19f13
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 12 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>vip.floatationdevice</groupId>
<artifactId>mc2gforward</artifactId>
<version>1.0-SNAPSHOT5</version>
<version>1.0-SNAPSHOT6</version>
<packaging>jar</packaging>

<name>MC2GForward</name>
Expand Down
27 changes: 16 additions & 11 deletions src/main/java/vip/floatationdevice/mc2gforward/BindManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
{//TODO: cleanups and optimizations when im began to feel better
public static HashMap<String, UUID> bindMap=new HashMap<String, UUID>();// key: guilded userId; value: mc player uuid
public static HashMap<String, UUID> pendingMap=new HashMap<String, UUID>();// key: bind code; value: mc player uuid
public static HashMap<UUID, String> pendingPlayerMap =new HashMap<UUID, String>();// key: mc player uuid; value: bind code
public static final Random r=new Random();
G4JClient client;

Expand Down Expand Up @@ -73,10 +74,11 @@ public void onGuildedChat(ChatMessageCreatedEvent event)
if(pendingMap.containsKey(args[2]))// code matched?
{
bindMap.put(event.getChatMessageObject().getCreatorId(), pendingMap.get(args[2]));
pendingPlayerMap.remove(pendingMap.get(args[2]));
pendingMap.remove(args[2]);
try{Bukkit.getPlayer(bindMap.get(event.getChatMessageObject().getCreatorId())).sendMessage("[MC2GForward] Binding process completed. Now you can send messages from Guilded server to Minecraft server");}catch(Exception ignored){}
try{Bukkit.getPlayer(bindMap.get(event.getChatMessageObject().getCreatorId())).sendMessage("[§6MC2GForward§f] §aSuccessfully bound your Guilded account\n §aNow you can send messages from Guilded server to Minecraft server");}catch(Exception ignored){}
sendGuildedMsg("[i] Successfully bound your account to "+getPlayerName(bindMap.get(event.getChatMessageObject().getCreatorId())), event.getChatMessageObject().getMsgId());
instance.getLogger().info(getPlayerName(bindMap.get(event.getChatMessageObject().getCreatorId()))+" bound successfully");
instance.getLogger().info(getPlayerName(bindMap.get(event.getChatMessageObject().getCreatorId()))+" successfully bound Guilded account");
saveBindMap();
}
else// code not in pending list?
Expand All @@ -90,10 +92,10 @@ else if(event.getChatMessageObject().getContent().equals("/mc2g rmbind"))
{
if(bindMap.containsKey(event.getChatMessageObject().getCreatorId()))// player bound?
{
try{Bukkit.getPlayer(bindMap.get(event.getChatMessageObject().getCreatorId())).sendMessage("[MC2GForward] Successfully unbound your Guilded account");}catch(Exception ignored){}
try{Bukkit.getPlayer(bindMap.get(event.getChatMessageObject().getCreatorId())).sendMessage("[§6MC2GForward§f] §aSuccessfully unbound your Guilded account");}catch(Exception ignored){}
UUID removed=bindMap.remove(event.getChatMessageObject().getCreatorId());
sendGuildedMsg("[i] Successfully unbound your Guilded account", event.getChatMessageObject().getMsgId());
instance.getLogger().info(getPlayerName(removed)+" unbound successfully");
instance.getLogger().info(getPlayerName(removed)+" successfully unbound Guilded account");
saveBindMap();
}
else// player not bound?
Expand All @@ -103,7 +105,7 @@ else if(event.getChatMessageObject().getContent().equals("/mc2g rmbind"))
}
else
{
if(bindMap.containsKey(event.getChatMessageObject().getCreatorId()))
if(!event.getChatMessageObject().getContent().startsWith("/")&&bindMap.containsKey(event.getChatMessageObject().getCreatorId()))
Bukkit.broadcastMessage("<"+getPlayerName(bindMap.get(event.getChatMessageObject().getCreatorId()))+"> "+event.getChatMessageObject().getContent());
}
}
Expand All @@ -120,9 +122,12 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
if(args.length==1&&args[0].equals("mkbind"))
{
String code="";// 10-digit random bind code from ASCII x21(!) to x7E(~)
for(int i=0;i!=10;i++) code+=String.valueOf((char)(r.nextInt(94)+33));
for(int i=0;i!=10;i++) code+=String.valueOf((char)(r.nextInt(94)+33));// StringBuilder not needed
if(pendingPlayerMap.containsKey(((Player)sender).getUniqueId())) // update bind code
pendingMap.remove(pendingPlayerMap.get(((Player)sender).getUniqueId()));
pendingMap.put(code, ((Player)sender).getUniqueId());
sender.sendMessage("[MC2GForward] Your bind code is: "+code+"\n Type \"/mc2g mkbind "+code+"\" in Guilded server to complete the bind process");
pendingPlayerMap.put(((Player)sender).getUniqueId(), code);
sender.sendMessage("[§6MC2GForward§f] Your bind code is: §a"+code+"\n §fType \"§a/mc2g mkbind "+code+"§f\" in Guilded server to confirm the bind");
instance.getLogger().info(sender.getName()+" requested a bind code: "+code);
return true;
}
Expand All @@ -133,18 +138,18 @@ else if(args.length==1&&args[0].equals("rmbind"))
if(bindMap.get(u).equals(((Player)sender).getUniqueId()))
{
bindMap.remove(u);
sender.sendMessage("[MC2GForward] Successfully unbound your Guilded account");
instance.getLogger().info(sender.getName()+" unbound successfully");
sender.sendMessage("[§6MC2GForward§f] §aSuccessfully unbound your Guilded account");
instance.getLogger().info(sender.getName()+" successfully unbound Guilded account");
saveBindMap();
return true;
}
}
sender.sendMessage("[MC2GForward] You must bind a Guilded account first");
sender.sendMessage("[§6MC2GForward§f] §cYou must bind a Guilded account first");
return false;
}
else
{
sender.sendMessage("[MC2GForward] Usage: /mc2g <mkbind/rmbind>");
sender.sendMessage("[§6MC2GForward§f] §eUsage: /mc2g <mkbind/rmbind>");
return false;
}
}
Expand Down

0 comments on commit 1d19f13

Please sign in to comment.