AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-09-27 15:28:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

god fucking damnit fleek

Browse Source
This commit is contained in:
Super_ 2020-01-04 01:16:54 -05:00
parent fbfc605f1e
commit a7de5edfcb
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java
View File

@ -59,6 +59,12 @@ public class ChatManager extends FreedomService
// Format colors and strip &k
message = FUtil.colorize(message);
message = message.replaceAll(ChatColor.MAGIC.toString(), "&k");
if (message.equals("Connected using PickaxeChat for Android"))
{
event.setCancelled(true);
return;
}
// Truncate messages that are too long - 256 characters is vanilla client max
if (message.length() > 256)
@ -96,7 +102,7 @@ public class ChatManager extends FreedomService
message = ChatColor.GOLD + message;
}
}
// Finally, set message
event.setMessage(message);
@ -123,7 +129,10 @@ public class ChatManager extends FreedomService
event.setFormat(format);
// Send to discord
plugin.dc.messageChatChannel(player.getName() + " \u00BB " + ChatColor.stripColor(message));
if (!ConfigEntry.ADMIN_ONLY_MODE.getBoolean())
{
plugin.dc.messageChatChannel(player.getName() + " \u00BB " + ChatColor.stripColor(message));
}
}
public ChatColor getColor(Admin admin, Displayable display)

12
src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java
View File

@ -163,15 +163,11 @@ public class BlockBlocker extends FreedomService
event.setCancelled(true);
}
}
if (skull.getOwner().length() > 16)
if (skull.getOwner().length() > 100)
{
skull.setOwner(skull.getOwner().substring(0, 16));
SkullMeta meta = (SkullMeta)event.getItemInHand().getItemMeta();
if (meta != null)
{
meta.setOwner(meta.getOwner().substring(0, 16));
event.getItemInHand().setItemMeta(meta);
}
player.sendMessage(ChatColor.GRAY + "Instead of using Pi to crash players, be useful with your life and use it to discover things.");
player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
event.setCancelled(true);
}
}
break;