TheDeusGroup/TFM-4.3-Reloaded
1
0
Fork 0
mirror of https://github.com/TheDeus-Group/TFM-4.3-Reloaded.git synced 2024-12-23 07:24:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/StevenLawson/TotalFreedomMod

Browse source
This commit is contained in:
Jerome van der Sar 2012-09-16 19:48:17 +02:00
commit 165c949744
10 changed files with 100 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/me/StevenLawson/TotalFreedomMod/Commands/Command_ops.java
View file

@ -2,7 +2,6 @@ package me.StevenLawson.TotalFreedomMod.Commands;
import me.StevenLawson.TotalFreedomMod.TFM_Util;
import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.Command;
@ -25,12 +24,12 @@ public class Command_ops extends TFM_Command
return false;
}
if (args[0].equalsIgnoreCase("list"))
{
String ops = "";
String delim = "";
for (OfflinePlayer p : server.getOperators()) {
for (OfflinePlayer p : server.getOperators())
{
ops += delim;
ops += p.getName();
delim = ",";

33
src/me/StevenLawson/TotalFreedomMod/Commands/Command_qdeop.java
View file

@ -16,10 +16,19 @@ public class Command_qdeop extends TFM_Command
return false;
}
if (senderIsConsole || TFM_Util.isUserSuperadmin(sender))
if (!(senderIsConsole || sender.isOp()))
{
sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS);
return true;
}
boolean matched_player = false;
for (Player p : server.matchPlayer(args[0]))
String target_name = args[0].toLowerCase();
for (Player p : server.getOnlinePlayers())
{
if (p.getName().toLowerCase().indexOf(target_name) > 0 || p.getDisplayName().toLowerCase().indexOf(target_name) > 0)
{
matched_player = true;
@ -27,25 +36,11 @@ public class Command_qdeop extends TFM_Command
p.setOp(false);
p.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP);
}
}
if (!matched_player)
{
for (Player p : server.getOnlinePlayers())
{
if (args[0].toLowerCase().startsWith(p.getDisplayName().toLowerCase()))
{
TFM_Util.adminAction(sender.getName(), "De-opping " + p.getName(), false);
p.setOp(false);
p.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP);
return true;
}
}
sender.sendMessage("No targets matched.");
}
}
else
{
sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS);
TFM_Util.playerMsg(sender, "No targets matched.");
}
return true;

7
src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java
View file

@ -24,7 +24,11 @@ public class Command_qop extends TFM_Command
boolean matched_player = false;
for (Player p : server.matchPlayer(args[0]))
String target_name = args[0].toLowerCase();
for (Player p : server.getOnlinePlayers())
{
if (p.getName().toLowerCase().indexOf(target_name) > 0 || p.getDisplayName().toLowerCase().indexOf(target_name) > 0)
{
matched_player = true;
@ -32,6 +36,7 @@ public class Command_qop extends TFM_Command
p.setOp(true);
p.sendMessage(TotalFreedomMod.YOU_ARE_OP);
}
}
if (!matched_player)
{

1
src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java
View file

@ -16,7 +16,6 @@ import org.bukkit.inventory.ItemStack;
public class TFM_BlockListener implements Listener
{
@EventHandler(priority = EventPriority.HIGH)
public void onBlockBurn(BlockBurnEvent event)
{

1
src/me/StevenLawson/TotalFreedomMod/Listener/TFM_EntityListener.java
View file

@ -9,7 +9,6 @@ import org.bukkit.event.entity.*;
public class TFM_EntityListener implements Listener
{
@EventHandler(priority = EventPriority.HIGH)
public void onEntityExplode(EntityExplodeEvent event)
{

33
src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
View file

@ -27,7 +27,6 @@ public class TFM_PlayerListener implements Listener
{
private static final SimpleDateFormat date_format = new SimpleDateFormat("yyyy-MM-dd \'at\' HH:mm:ss z");
@EventHandler(priority = EventPriority.HIGH)
public void onPlayerInteract(PlayerInteractEvent event)
{
@ -301,8 +300,7 @@ public class TFM_PlayerListener implements Listener
{
try
{
String m = event.getMessage();
Player p = event.getPlayer();
final Player p = event.getPlayer();
TFM_UserInfo playerdata = TFM_UserInfo.getPlayerData(p);
playerdata.incrementMsgCount();
@ -337,28 +335,37 @@ public class TFM_PlayerListener implements Listener
}
}
String message = event.getMessage().trim();
// strip color from messages
message = ChatColor.stripColor(message);
// truncate messages that are too long
if (m.length() > 95)
if (message.length() > 95)
{
event.setMessage(m.substring(0, 95));
message = message.substring(0, 95);
TFM_Util.playerMsg(p, "Message was shortened, because it was too long to send.");
}
// check for caps
int caps = 0;
for (int i=0; i<m.length(); i++)
if (message.length() >= 6)
{
int caps = 0;
for (char c : message.toCharArray())
{
if (Character.isUpperCase(c))
{
if (Character.isUpperCase(m.charAt(i)))
caps++;
}
if(caps > 6)
}
if (((float) caps / (float) message.length()) > 0.75) //Compute a ratio so that longer sentences can have more caps.
{
event.setMessage(m.toLowerCase());
message = message.toLowerCase();
}
}
// strip color from messages
event.setMessage(ChatColor.stripColor(event.getMessage()));
// finally, set message
event.setMessage(message);
}
catch (Exception ex)
{

1
src/me/StevenLawson/TotalFreedomMod/Listener/TFM_WeatherListener.java
View file

@ -9,7 +9,6 @@ import org.bukkit.event.weather.WeatherChangeEvent;
public class TFM_WeatherListener implements Listener
{
@EventHandler(priority = EventPriority.HIGH)
public void onThunderChange(ThunderChangeEvent event)
{