Added enderchest protection for twohundred and fixed rainbow text :P
This commit is contained in:
parent
37ba5a5d5f
commit
1495685a13
8 changed files with 36 additions and 5 deletions
Binary file not shown.
|
@ -196,6 +196,9 @@ public class Commands implements CommandExecutor {
|
||||||
p.OtherColorMode, p.OtherColorMode));
|
p.OtherColorMode, p.OtherColorMode));
|
||||||
else
|
else
|
||||||
player.sendMessage("§eMessage color reset.");
|
player.sendMessage("§eMessage color reset.");
|
||||||
|
} else {
|
||||||
|
player.sendMessage("§cYou don't have permission for this command.");
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -10,7 +10,6 @@ import java.util.Random;
|
||||||
import java.util.Timer;
|
import java.util.Timer;
|
||||||
import java.util.TimerTask;
|
import java.util.TimerTask;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.regex.Matcher;
|
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
|
@ -27,6 +26,7 @@ import org.bukkit.event.entity.PlayerDeathEvent;
|
||||||
import org.bukkit.event.player.AsyncPlayerChatEvent;
|
import org.bukkit.event.player.AsyncPlayerChatEvent;
|
||||||
import org.bukkit.event.player.PlayerChatTabCompleteEvent;
|
import org.bukkit.event.player.PlayerChatTabCompleteEvent;
|
||||||
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
|
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
|
||||||
|
import org.bukkit.event.player.PlayerInteractEvent;
|
||||||
import org.bukkit.event.player.PlayerJoinEvent;
|
import org.bukkit.event.player.PlayerJoinEvent;
|
||||||
import org.bukkit.event.player.PlayerMoveEvent;
|
import org.bukkit.event.player.PlayerMoveEvent;
|
||||||
import org.bukkit.event.player.PlayerPickupItemEvent;
|
import org.bukkit.event.player.PlayerPickupItemEvent;
|
||||||
|
@ -223,6 +223,7 @@ public class PlayerListener implements Listener { // 2015.07.16.
|
||||||
final String[] RainbowPresserColors = new String[] { "c", "6", "e",
|
final String[] RainbowPresserColors = new String[] { "c", "6", "e",
|
||||||
"a", "9", "5" };
|
"a", "9", "5" };
|
||||||
int rpc = 0;
|
int rpc = 0;
|
||||||
|
int currentindex = 0;
|
||||||
for (String item : parts) {
|
for (String item : parts) {
|
||||||
try {
|
try {
|
||||||
URL url = new URL(item);
|
URL url = new URL(item);
|
||||||
|
@ -256,15 +257,25 @@ public class PlayerListener implements Listener { // 2015.07.16.
|
||||||
else
|
else
|
||||||
rpc = 0;
|
rpc = 0;
|
||||||
}
|
}
|
||||||
formattedmessage = formattedmessage.replaceFirst(
|
/*System.out.println("item: " + item); // TO!DO: TMP
|
||||||
"(?i)" + Pattern.quote(item),
|
System.out.println("currentindex: " + currentindex);
|
||||||
Matcher.quoteReplacement("§"
|
System.out.println("format: "
|
||||||
+ RainbowPresserColors[rpc] + item));
|
+ String.format("§%s%s", RainbowPresserColors[rpc],
|
||||||
|
item));
|
||||||
|
System.out.println("formattedmessage: " + formattedmessage);*/
|
||||||
|
StringBuffer buf = new StringBuffer(formattedmessage);
|
||||||
|
buf.replace(currentindex, currentindex + item.length(),
|
||||||
|
String.format("§%s%s", RainbowPresserColors[rpc], item));
|
||||||
|
formattedmessage = buf.toString();
|
||||||
|
/*
|
||||||
|
* "§" + RainbowPresserColors[rpc] + item));
|
||||||
|
*/
|
||||||
if (rpc + 1 < RainbowPresserColors.length)
|
if (rpc + 1 < RainbowPresserColors.length)
|
||||||
rpc++;
|
rpc++;
|
||||||
else
|
else
|
||||||
rpc = 0;
|
rpc = 0;
|
||||||
}
|
}
|
||||||
|
currentindex += item.length() + 3;
|
||||||
}
|
}
|
||||||
if (player.OtherColorMode != 0xFF) {
|
if (player.OtherColorMode != 0xFF) {
|
||||||
formattedmessage = String.format("§%x%s", player.OtherColorMode,
|
formattedmessage = String.format("§%x%s", player.OtherColorMode,
|
||||||
|
@ -1065,4 +1076,21 @@ public class PlayerListener implements Listener { // 2015.07.16.
|
||||||
"§cYou are not allowed to teleport to/from No Mans Land.");
|
"§cYou are not allowed to teleport to/from No Mans Land.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void onPlayerInteract(PlayerInteractEvent e) {
|
||||||
|
MinigamePlayer mp = Minigames.plugin.pdata.getMinigamePlayer(e
|
||||||
|
.getPlayer());
|
||||||
|
if (mp == null)
|
||||||
|
return;
|
||||||
|
if (mp.getMinigame().getName(false).equalsIgnoreCase("twohundred")) {
|
||||||
|
if (e.getClickedBlock().getType() == Material.ENDER_CHEST) {
|
||||||
|
e.setCancelled(true);
|
||||||
|
e.getPlayer().sendMessage(
|
||||||
|
"§You are not allowed to use enderchests here.");
|
||||||
|
System.out.println(e.getPlayer().getName()
|
||||||
|
+ " tried to use an enderchest in twohundred.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
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