Upstream
/
ChestShop-3
mirror of https://github.com/ChestShop-authors/ChestShop-3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rework LWC module

This commit is contained in:
Acrobot 2013-03-16 18:32:41 +01:00
parent 7d8c2d56b0
commit 86889b0ffc
2 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/Acrobot/ChestShop/Listeners/TeleportFixListener.java
View File

@ -1,21 +0,0 @@
package com.Acrobot.ChestShop.Listeners;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerTeleportEvent;
/**
* @author Acrobot
*/
public class TeleportFixListener implements Listener {
@EventHandler(priority = EventPriority.MONITOR)
public static void onTeleport(PlayerTeleportEvent event) {
if (event.isCancelled()) {
return;
}
event.getPlayer().closeInventory();
}
}

13
src/main/java/com/Acrobot/ChestShop/Plugins/LightweightChestProtection.java
View File

@ -8,7 +8,7 @@ import com.Acrobot.ChestShop.Events.ShopCreatedEvent;
import com.Acrobot.ChestShop.Security;
import com.griefcraft.lwc.LWC;
import com.griefcraft.model.Protection;
import com.griefcraft.modules.limits.LimitsV2;
import com.griefcraft.scripting.event.LWCProtectionRegisterEvent;
import org.bukkit.Bukkit;
import org.bukkit.block.Block;
import org.bukkit.block.Chest;
@ -23,11 +23,9 @@ import org.bukkit.event.Listener;
*/
public class LightweightChestProtection implements Listener {
private LWC lwc;
private LimitsV2 limitsModule;
public LightweightChestProtection() {
this.lwc = LWC.getInstance();
limitsModule = new LimitsV2();
}
@EventHandler
@ -76,7 +74,7 @@ public class LightweightChestProtection implements Listener {
Block block = event.getBlock();
Player player = Bukkit.getPlayerExact(event.getName());
if (player == null || limitsModule.hasReachedLimit(player, block.getType())) {
if (player == null) {
return;
}
@ -93,6 +91,13 @@ public class LightweightChestProtection implements Listener {
return;
}
LWCProtectionRegisterEvent protectionEvent = new LWCProtectionRegisterEvent(player, block);
lwc.getModuleLoader().dispatchEvent(protectionEvent);
if (protectionEvent.isCancelled()) {
return;
}
Protection protection = lwc.getPhysicalDatabase().registerProtection(block.getTypeId(), Protection.Type.PRIVATE, worldName, event.getName(), "", x, y, z);
if (protection != null) {