Upstream
/
UltimateModeration
mirror of https://github.com/songoda/UltimateModeration.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

This commit is contained in:
Brianna 2020-03-12 10:16:01 -04:00
parent d896464217 3fe08e370c
commit 51ca041eed
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -2,7 +2,7 @@
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>UltimateModeration</artifactId> <artifactId>UltimateModeration</artifactId>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>1.2.4</version> <version>1.2.5</version>
<build> <build>
<defaultGoal>clean install</defaultGoal> <defaultGoal>clean install</defaultGoal>
<finalName>UltimateModeration-${project.version}</finalName> <finalName>UltimateModeration-${project.version}</finalName>

2
src/main/java/com/songoda/ultimatemoderation/UltimateModeration.java
View File

@ -158,7 +158,7 @@ public class UltimateModeration extends SongodaPlugin {
row.get("duration").asLong(), row.get("duration").asLong(),
row.get("reason").asString(), row.get("reason").asString(),
UUID.fromString(row.get("victim").asString()), UUID.fromString(row.get("victim").asString()),
UUID.fromString(row.get("punisher").asString()), row.get("punisher").asObject() == null ? null : UUID.fromString(row.get("punisher").asString()),
row.get("expiration").asLong(), row.get("expiration").asLong(),
playerUUID); playerUUID);
PlayerPunishData playerPunishData = getPunishmentManager().getPlayer(playerUUID); PlayerPunishData playerPunishData = getPunishmentManager().getPlayer(playerUUID);

29
src/main/java/com/songoda/ultimatemoderation/listeners/BlockListener.java
View File

@ -2,7 +2,6 @@ package com.songoda.ultimatemoderation.listeners;
import com.songoda.ultimatemoderation.UltimateModeration; import com.songoda.ultimatemoderation.UltimateModeration;
import com.songoda.ultimatemoderation.staffchat.StaffChatManager; import com.songoda.ultimatemoderation.staffchat.StaffChatManager;
import java.util.List;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@ -11,32 +10,34 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockBreakEvent;
import java.util.List;
public class BlockListener implements Listener { public class BlockListener implements Listener {
private UltimateModeration instance; private UltimateModeration instance;
private StaffChatManager chat = UltimateModeration.getInstance().getStaffChatManager(); private StaffChatManager chat = UltimateModeration.getInstance().getStaffChatManager();
public BlockListener(UltimateModeration ultimateModeration) { public BlockListener(UltimateModeration ultimateModeration) {
this.instance = ultimateModeration; this.instance = ultimateModeration;
} }
@EventHandler @EventHandler
public void onBlockBreak(BlockBreakEvent event) { public void onBlockBreak(BlockBreakEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
Block block = event.getBlock(); Block block = event.getBlock();
Material material = block.getType(); Material material = block.getType();
List<String> blocks = instance.getConfig().getStringList("Main.Notify Blocks List"); List<String> blocks = instance.getConfig().getStringList("Main.Notify Blocks List");
for(String broken : blocks) { for (String broken : blocks) {
if(broken.equalsIgnoreCase(material.name())) { if (!broken.equalsIgnoreCase(material.name())) continue;
if(player.hasPermission("um.staffchat.join") && instance.getConfig().getBoolean("Main.Notify Blocks")) {
chat.getChat("notify").messageAll("&7[UM] &a" + Bukkit.getPlayer(player.getUniqueId()).getDisplayName() if (player.hasPermission("um.trackblockbreaks") && instance.getConfig().getBoolean("Main.Notify Blocks")) {
+ UltimateModeration.getInstance().getLocale().getMessage("notify.block.main").getMessage().replace("%material%", material.name()) + "(" + block.getX() + ", " + block.getY() + ", " + block.getZ() + ")&a!"); chat.getChat("notify").messageAll("&7[UM] &a" + Bukkit.getPlayer(player.getUniqueId()).getDisplayName()
} + UltimateModeration.getInstance().getLocale().getMessage("notify.block.main").getMessage().replace("%material%", material.name()) + "(" + block.getX() + ", " + block.getY() + ", " + block.getZ() + ")&a!");
} }
} }
} }
} }