Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable DeniedMessageEvent

Browse Source 
I don't know if this is the problem regarding another similar issue, but
I'd rather not risk it + it's likely not being used
This commit is contained in:
RoboMWM 2017-06-15 22:44:02 -07:00
parent 8e484ad4f7
commit f918ee18bc
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -58,7 +58,7 @@
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId> <artifactId>bukkit</artifactId>
<version>1.12-pre2-SNAPSHOT</version> <version>1.12-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!--Worldguard dependency--> <!--Worldguard dependency-->

44
src/me/ryanhamshire/GriefPrevention/DataStore.java
View File

@ -18,16 +18,15 @@
package me.ryanhamshire.GriefPrevention; package me.ryanhamshire.GriefPrevention;
import java.io.*; import com.google.common.io.Files;
import java.nio.charset.Charset;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern;
import me.ryanhamshire.GriefPrevention.events.ClaimDeletedEvent; import me.ryanhamshire.GriefPrevention.events.ClaimDeletedEvent;
import org.bukkit.Bukkit;
import me.ryanhamshire.GriefPrevention.events.DeniedMessageEvent; import org.bukkit.ChatColor;
import org.bukkit.*; import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.AnimalTamer; import org.bukkit.entity.AnimalTamer;
@ -37,7 +36,26 @@ import org.bukkit.entity.Tameable;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import com.google.common.io.Files; import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern;
//singleton class which manages all GriefPrevention data (except for config options) //singleton class which manages all GriefPrevention data (except for config options)
public abstract class DataStore public abstract class DataStore
@ -1686,12 +1704,6 @@ public abstract class DataStore
message = message.replace("{" + i + "}", param); message = message.replace("{" + i + "}", param);
} }
if (Bukkit.isPrimaryThread())
{
DeniedMessageEvent event = new DeniedMessageEvent(messageID, message);
Bukkit.getPluginManager().callEvent(event);
return event.getMessage();
}
return message; return message;
} }