|
8 | 8 | import com.sk89q.worldguard.protection.regions.RegionQuery; |
9 | 9 | import org.bukkit.Bukkit; |
10 | 10 | import org.bukkit.entity.Player; |
| 11 | +import org.bukkit.event.EventHandler; |
11 | 12 | import org.bukkit.event.Listener; |
12 | | -import org.bukkit.plugin.Plugin; |
13 | | -import org.bukkit.plugin.PluginManager; |
| 13 | +import org.bukkit.event.server.PluginDisableEvent; |
14 | 14 | import org.bukkit.plugin.java.JavaPlugin; |
15 | 15 |
|
16 | 16 | import javax.annotation.Nonnull; |
|
19 | 19 | import java.util.HashSet; |
20 | 20 | import java.util.Set; |
21 | 21 | import java.util.UUID; |
22 | | -import java.util.logging.Logger; |
23 | 22 | import java.util.stream.Collectors; |
24 | 23 | /** |
25 | 24 | * @author Weby & Anrza ([email protected]) |
26 | 25 | * @since 2/24/19 |
27 | 26 | */ |
28 | | -public class WorldGuardEvents extends JavaPlugin implements Listener { |
| 27 | +public class WorldGuardEvents implements Listener { |
29 | 28 | static RegionContainer container; |
30 | | - |
31 | | - // Listeners listeners = null; |
32 | | - public void onEnable() { |
33 | | - Logger log = Bukkit.getLogger(); |
34 | | - PluginManager pm = Bukkit.getPluginManager(); |
35 | | - Plugin p = Bukkit.getPluginManager().getPlugin("WorldGuard"); |
36 | | - |
37 | | - if (p == null) { |
38 | | - log.severe("[WorldGuardEvents] WorldGuard wasn't found. Disabling WorldGuardEvents."); |
39 | | - pm.disablePlugin(this); |
40 | | - return; |
41 | | - } |
42 | | - |
43 | | - String version = WorldGuard.getVersion(); |
44 | | - |
45 | | - if (version.isEmpty()) { |
46 | | - log.severe("[WorldGuardEvents] WorldGuard's version not detected. Are you sure it's installed properly ?"); |
47 | | - log.severe("[WorldGuardEvents] Disabling WorldGuardEvents."); |
48 | | - |
49 | | - pm.disablePlugin(this); |
50 | | - return; |
51 | | - } |
52 | | - |
53 | | - if (!version.startsWith("7.")) { |
54 | | - log.warning("[WorldGuardEvents] Detected WorldGuard version \"" + version + "\"."); |
55 | | - log.warning("[WorldGuardEvents] This plugin is meant to work with WorldGuard version \"7.0.0\" or higher,"); |
56 | | - log.warning("[WorldGuardEvents] and may not work properly with any other major revision."); |
57 | | - log.warning("[WorldGuardEvents] Please update WorldGuard if your version is below \"7.0.0\" or wait for"); |
58 | | - log.warning("[WorldGuardEvents] an update of WorldGuardEvents to support WorldGuard "+version+"."); |
59 | | - } |
60 | | - |
61 | | - if (!WorldGuard.getInstance().getPlatform().getSessionManager().registerHandler(Entry.factory, null)) { |
62 | | - log.severe("[WorldGuardEvents] Could not register the entry handler !"); |
63 | | - log.severe("[WorldGuardEvents] Please report this error. The plugin will now be disabled."); |
64 | | - |
65 | | - pm.disablePlugin(this); |
66 | | - return; |
67 | | - } |
68 | | - |
| 29 | + |
| 30 | + public void enable(JavaPlugin plugin) { |
69 | 31 | container = WorldGuard.getInstance().getPlatform().getRegionContainer(); |
| 32 | + WorldGuard.getInstance().getPlatform().getSessionManager().registerHandler(Entry.factory, null); |
| 33 | + plugin.getServer().getPluginManager().registerEvents(this, plugin); |
70 | 34 | } |
71 | 35 |
|
72 | | - @Override |
73 | | - public void onDisable() |
| 36 | + @EventHandler |
| 37 | + public void onDisable(PluginDisableEvent event) |
74 | 38 | { |
75 | 39 | container = null; |
76 | 40 | } |
|
0 commit comments