Compare commits
2 Commits
2.4.0_Snap
...
2.4.1_Snap
Author | SHA1 | Date | |
---|---|---|---|
e8a3c26650 | |||
156784f37c |
4
pom.xml
4
pom.xml
@@ -6,7 +6,7 @@
|
||||
|
||||
<groupId>de.jatitv</groupId>
|
||||
<artifactId>OPSecurity</artifactId>
|
||||
<version>2.4.0_Snapshot_2</version>
|
||||
<version>2.4.0</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>OPSecurity</name>
|
||||
@@ -73,7 +73,7 @@
|
||||
<dependency>
|
||||
<groupId>net.t2code</groupId>
|
||||
<artifactId>T2CodeLib</artifactId>
|
||||
<version>10.0</version>
|
||||
<version>10.1</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
@@ -18,6 +18,7 @@ import java.util.Iterator;
|
||||
|
||||
public class LPCommand implements Listener {
|
||||
|
||||
/*
|
||||
private boolean LPCheck(String command) {
|
||||
if (command.charAt(0) == '/') {
|
||||
command = command.replaceFirst("/", "");
|
||||
@@ -83,4 +84,6 @@ public class LPCommand implements Listener {
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
|
||||
*/
|
||||
}
|
||||
|
@@ -21,35 +21,6 @@ import org.bukkit.event.server.ServerCommandEvent;
|
||||
|
||||
public class OPCommand implements Listener {
|
||||
|
||||
private int isNotOPWTL(String command) {
|
||||
if (command.charAt(0) == '/') command = command.replaceFirst("/", "");
|
||||
String arg = command.replace("op ", "");
|
||||
|
||||
if (SelectConfig.PlayerMustBeOnlineToOp) {
|
||||
if (Main.opHashMap.containsKey(arg.toLowerCase())) {
|
||||
Player target = Bukkit.getPlayer(arg);
|
||||
if (target == null) {
|
||||
return 1;
|
||||
}
|
||||
if (Main.opHashMap.get(target.getName().toLowerCase()).UUID.equals(target.getUniqueId().toString().replace("-", ""))) {
|
||||
return 0;
|
||||
} else return 2;
|
||||
} else return 2;
|
||||
} else {
|
||||
if (Main.opHashMap.containsKey(arg.toLowerCase())) {
|
||||
String targetUUID = null;
|
||||
try {
|
||||
targetUUID = NameHistory.getPlayerUUID(arg);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
if (Main.opHashMap.get(arg.toLowerCase()).UUID.equals(targetUUID)) {
|
||||
return 0;
|
||||
} else return 2;
|
||||
} else return 2;
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onOPServer(ServerCommandEvent event) {
|
||||
if ((event.getCommand().toLowerCase().startsWith("op ") || event.getCommand().toLowerCase().startsWith("minecraft:op ")) && SelectConfig.OP_Whitelist_Enable) {
|
||||
@@ -84,4 +55,33 @@ public class OPCommand implements Listener {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private int isNotOPWTL(String command) {
|
||||
if (command.charAt(0) == '/') command = command.replaceFirst("/", "");
|
||||
String arg = command.replace("op ", "");
|
||||
|
||||
if (SelectConfig.PlayerMustBeOnlineToOp) {
|
||||
if (Main.opHashMap.containsKey(arg.toLowerCase())) {
|
||||
Player target = Bukkit.getPlayer(arg);
|
||||
if (target == null) {
|
||||
return 1;
|
||||
}
|
||||
if (Main.opHashMap.get(target.getName().toLowerCase()).UUID.equals(target.getUniqueId().toString().replace("-", ""))) {
|
||||
return 0;
|
||||
} else return 2;
|
||||
} else return 2;
|
||||
} else {
|
||||
if (Main.opHashMap.containsKey(arg.toLowerCase())) {
|
||||
String targetUUID = null;
|
||||
try {
|
||||
targetUUID = NameHistory.getPlayerUUID(arg);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
if (Main.opHashMap.get(arg.toLowerCase()).UUID.equals(targetUUID)) {
|
||||
return 0;
|
||||
} else return 2;
|
||||
} else return 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user