From 1abb4817482e9e47705033f350b737412dc6351c Mon Sep 17 00:00:00 2001
From: j502647092 <jtb1@163.com>
Date: Tue, 28 Apr 2015 16:38:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=9D=E6=8A=A4=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: j502647092 <jtb1@163.com>
---
 .../ProtectItem/listen/BreakBlockListen.java        |  2 +-
 .../ProtectItem/listen/DropItemListen.java          |  3 +--
 .../ProtectItem/listen/PickupItemListen.java        |  3 +--
 .../ProtectItem/listen/PlaceBlockListen.java        |  2 +-
 src/config.yml                                      | 13 ++++++-------
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/cn/CityCraft/ProtectItem/listen/BreakBlockListen.java b/src/cn/CityCraft/ProtectItem/listen/BreakBlockListen.java
index 5918e52..83158cf 100644
--- a/src/cn/CityCraft/ProtectItem/listen/BreakBlockListen.java
+++ b/src/cn/CityCraft/ProtectItem/listen/BreakBlockListen.java
@@ -16,7 +16,7 @@ public class BreakBlockListen implements Listener {
 	}
 
 	@EventHandler(ignoreCancelled = true)
-	public void onDropItem(BlockBreakEvent e) {
+	public void onBreakItem(BlockBreakEvent e) {
 		Player p = e.getPlayer();
 		String i = e.getBlock().getType().name();
 		e.setCancelled(plugin.checkevent(p, i, "Break")); 
diff --git a/src/cn/CityCraft/ProtectItem/listen/DropItemListen.java b/src/cn/CityCraft/ProtectItem/listen/DropItemListen.java
index 57aaf63..f119960 100644
--- a/src/cn/CityCraft/ProtectItem/listen/DropItemListen.java
+++ b/src/cn/CityCraft/ProtectItem/listen/DropItemListen.java
@@ -19,7 +19,6 @@ public class DropItemListen implements Listener {
 	public void onDropItem(PlayerDropItemEvent e) {
 		Player p = e.getPlayer();
 		String i = e.getItemDrop().getItemStack().getType().name();
-		if (plugin.checkevent(p, i, "Drop"))
-			e.getItemDrop().remove();
+		e.setCancelled(plugin.checkevent(p, i, "Drop")); 
 	}
 }
diff --git a/src/cn/CityCraft/ProtectItem/listen/PickupItemListen.java b/src/cn/CityCraft/ProtectItem/listen/PickupItemListen.java
index 26c3d7e..e3c6e4c 100644
--- a/src/cn/CityCraft/ProtectItem/listen/PickupItemListen.java
+++ b/src/cn/CityCraft/ProtectItem/listen/PickupItemListen.java
@@ -19,8 +19,7 @@ public class PickupItemListen implements Listener {
 	public void onPickupItem(PlayerPickupItemEvent e) {
 		Player p = e.getPlayer();
 		String i = e.getItem().getItemStack().getType().name();
-		if (plugin.checkevent(p, i, "Pickup"))
-			e.getItem().remove();
+		e.setCancelled(plugin.checkevent(p, i,  "Pickup")); 
 	}
 
 }
diff --git a/src/cn/CityCraft/ProtectItem/listen/PlaceBlockListen.java b/src/cn/CityCraft/ProtectItem/listen/PlaceBlockListen.java
index 5811c49..897f911 100644
--- a/src/cn/CityCraft/ProtectItem/listen/PlaceBlockListen.java
+++ b/src/cn/CityCraft/ProtectItem/listen/PlaceBlockListen.java
@@ -16,7 +16,7 @@ public class PlaceBlockListen implements Listener {
 	}
 
 	@EventHandler(ignoreCancelled = true)
-	public void onDropItem(BlockPlaceEvent e) {
+	public void onPlaceItem(BlockPlaceEvent e) {
 		Player p = e.getPlayer();
 		String i = e.getBlock().getType().name();
 		e.setCancelled(plugin.checkevent(p, i, "Place")); 
diff --git a/src/config.yml b/src/config.yml
index 38f07f7..e6c0e3f 100644
--- a/src/config.yml
+++ b/src/config.yml
@@ -2,16 +2,16 @@
 #服务器名称
 servername: ''
 #插件名称
-pluginname: '&6[&3海岛保护&6]&r'
+pluginname: '&6[&3物品保护&6]&r'
 
 #提示消息
 Message: 
   Reload: '&a配置文件已重新载入！'
 #方块安全提示
-  Drop: '&c当前世界禁止丢弃泥土,丢弃的泥土已清空！'
-  Pickup: '&c当前世界禁止拾取泥土,拾取的泥土已清空！'
-  Place: '&c当前世界禁止放置泥土,箱子！'
-  Break: '&c当前世界禁止破坏泥土,箱子！'
+  Drop: '&c当前世界禁止丢弃该物品！'
+  Pickup: '&c当前世界禁止拾取该物品！'
+  Place: '&c当前世界禁止放置该物品！'
+  Break: '&c当前世界禁止破坏该物品！'
   
 #受到保护的类型
 Protect: 
@@ -23,9 +23,8 @@ Protect:
 #受到保护的世界(不区分大小写)
 ProtectWorld: 
   - world
-  - AcidIsland_nether
   
-#保护的方块(不区分大小写)
+#保护的物品(不区分大小写)
 ProtectItem: 
   - DIRT 
   - GRASS