Fixed stuff
This commit is contained in:
parent
3d5893360c
commit
7a2d11afa1
11 changed files with 9 additions and 13 deletions
Binary file not shown.
|
@ -33,6 +33,6 @@
|
||||||
<classpathentry kind="lib" path="D:/Z - Norbi cucca/0 Projektek/TheButtonMCAutoFlairProto/Spigot server/plugins/_/worldedit-bukkit-6.1.jar"/>
|
<classpathentry kind="lib" path="D:/Z - Norbi cucca/0 Projektek/TheButtonMCAutoFlairProto/Spigot server/plugins/_/worldedit-bukkit-6.1.jar"/>
|
||||||
<classpathentry kind="lib" path="D:/Z - Norbi cucca/0 Projektek/TheButtonMCAutoFlairProto/Spigot server/plugins/_server/OreRegen1.5.jar"/>
|
<classpathentry kind="lib" path="D:/Z - Norbi cucca/0 Projektek/TheButtonMCAutoFlairProto/Spigot server/plugins/_server/OreRegen1.5.jar"/>
|
||||||
<classpathentry kind="lib" path="D:/Z - Norbi cucca/0 Projektek/TheButtonMCAutoFlairProto/Spigot server/plugins/_/ProtocolLib.jar"/>
|
<classpathentry kind="lib" path="D:/Z - Norbi cucca/0 Projektek/TheButtonMCAutoFlairProto/Spigot server/plugins/_/ProtocolLib.jar"/>
|
||||||
<classpathentry kind="lib" path="D:/Z - Norbi cucca/0 Projektek/TheButtonMCAutoFlairProto/Spigot server/plugins/FastLogin.jar"/>
|
<classpathentry kind="lib" path="D:/Z - Norbi cucca/0 Projektek/TheButtonMCAutoFlairProto/Spigot server/plugins/_/FastLogin.jar"/>
|
||||||
<classpathentry kind="output" path="target/classes"/>
|
<classpathentry kind="output" path="target/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -6,10 +6,10 @@ commands:
|
||||||
description: Auto-flair system. Accept or ignore flair.
|
description: Auto-flair system. Accept or ignore flair.
|
||||||
usage: "&cUsage: /u accept|ignore|opme&r"
|
usage: "&cUsage: /u accept|ignore|opme&r"
|
||||||
nrp:
|
nrp:
|
||||||
description: Send message in Out-of-Character
|
description: Send message in Out-of-Character.
|
||||||
usage: "&cUsage: /nrp <message>&r"
|
usage: "&cUsage: /nrp <message>&r"
|
||||||
ooc:
|
ooc:
|
||||||
description: Send message in Out-of-Character
|
description: Send message in Out-of-Character.
|
||||||
usage: "&cUsage: /ooc <message>&r"
|
usage: "&cUsage: /ooc <message>&r"
|
||||||
unlol:
|
unlol:
|
||||||
description: Unlaugh the last laugh.
|
description: Unlaugh the last laugh.
|
||||||
|
@ -22,7 +22,7 @@ commands:
|
||||||
warmode:
|
warmode:
|
||||||
description: Toggles war mode
|
description: Toggles war mode
|
||||||
author: NorbiPeti
|
author: NorbiPeti
|
||||||
depend: [Essentials, Towny, Minigames, Votifier, Factions, WorldGuard, WorldEdit, OreRegenerator, ProtocolLib, FastLogin, Vault]
|
depend: [Essentials, Towny, Minigames, Votifier, Factions, WorldGuard, WorldEdit, ProtocolLib, FastLogin, Vault]
|
||||||
permissions:
|
permissions:
|
||||||
tbmc.admin:
|
tbmc.admin:
|
||||||
description: Gives access to /un- commands and /u admin commands
|
description: Gives access to /un- commands and /u admin commands
|
||||||
|
|
|
@ -92,17 +92,21 @@ public class Commands implements CommandExecutor {
|
||||||
p.Working = true;
|
p.Working = true;
|
||||||
Timer timer = new Timer();
|
Timer timer = new Timer();
|
||||||
PlayerJoinTimerTask tt = new PlayerJoinTimerTask() {
|
PlayerJoinTimerTask tt = new PlayerJoinTimerTask() {
|
||||||
|
Player player = Bukkit.getPlayer(mp.UUID);
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
try {
|
try {
|
||||||
PluginMain.Instance.DownloadFlair(mp);
|
PluginMain.Instance.DownloadFlair(mp);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
player.sendMessage("Sorry, but an error occured while trying to get your flair. Please contact a mod.");
|
||||||
|
mp.Working = false;
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Player player = Bukkit.getPlayer(mp.UUID);
|
|
||||||
if (mp.FlairState.equals(FlairStates.Commented)) {
|
if (mp.FlairState.equals(FlairStates.Commented)) {
|
||||||
player.sendMessage("Sorry, but your flair isn't recorded. Please ask an admin to set it for you. Also, prepare a comment on /r/thebutton, if possible.");
|
player.sendMessage("Sorry, but your flair isn't recorded. Please ask an admin to set it for you. Also, prepare a comment on /r/thebutton, if possible.");
|
||||||
|
mp.Working = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
String flair = mp.GetFormattedFlair();
|
String flair = mp.GetFormattedFlair();
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package tk.sznp.thebuttonautoflair;
|
package tk.sznp.thebuttonautoflair;
|
||||||
|
|
||||||
import me.steffansk1997.OreRegenerator.OreRegenerator;
|
|
||||||
import net.milkbowl.vault.chat.Chat;
|
import net.milkbowl.vault.chat.Chat;
|
||||||
import net.milkbowl.vault.economy.Economy;
|
import net.milkbowl.vault.economy.Economy;
|
||||||
import net.milkbowl.vault.permission.Permission;
|
import net.milkbowl.vault.permission.Permission;
|
||||||
|
@ -25,8 +24,6 @@ import com.palmergames.bukkit.towny.Towny;
|
||||||
import com.palmergames.bukkit.towny.object.Nation;
|
import com.palmergames.bukkit.towny.object.Nation;
|
||||||
import com.palmergames.bukkit.towny.object.Town;
|
import com.palmergames.bukkit.towny.object.Town;
|
||||||
import com.palmergames.bukkit.towny.object.TownyUniverse;
|
import com.palmergames.bukkit.towny.object.TownyUniverse;
|
||||||
import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
|
|
||||||
import com.sk89q.worldguard.protection.flags.StateFlag;
|
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.lang.String;
|
import java.lang.String;
|
||||||
|
@ -123,11 +120,6 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15.
|
||||||
|
|
||||||
GameMechanics.addGameMechanic(new CreativeGlobalMechanic());
|
GameMechanics.addGameMechanic(new CreativeGlobalMechanic());
|
||||||
|
|
||||||
((WorldGuardPlugin) Bukkit.getPluginManager().getPlugin("WorldGuard"))
|
|
||||||
.getRegionManager(Bukkit.getWorlds().get(0))
|
|
||||||
.getRegion("__global__")
|
|
||||||
.setFlag(OreRegenerator.FLAG_REGENORES, StateFlag.State.DENY);
|
|
||||||
|
|
||||||
Runnable r = new Runnable() {
|
Runnable r = new Runnable() {
|
||||||
public void run() {
|
public void run() {
|
||||||
ThreadMethod();
|
ThreadMethod();
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in a new issue