502647092/QuickShop
1
0
Fork 0
mirror of https://e.coding.net/circlecloud/QuickShop.git synced 2024-11-22 01:58:54 +00:00
Code Releases Activity

修复错误 拦截Error...

Browse Source 
Signed-off-by: 502647092 <jtb1@163.com>
This commit is contained in:
502647092 2016-01-15 01:30:50 +08:00
parent 0284355c87
commit f8888f5c9f
5 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.maxgamer</groupId> <groupId>org.maxgamer</groupId>
<artifactId>QuickShop</artifactId> <artifactId>QuickShop</artifactId>
<version>1.8</version> <version>1.8.1</version>
<description>快捷商店重置版本...</description> <description>快捷商店重置版本...</description>
<build> <build>
<finalName>${project.name}</finalName> <finalName>${project.name}</finalName>

2
src/main/java/org/maxgamer/QuickShop/Config/ConfigManager.java
View File

@ -89,7 +89,7 @@ public class ConfigManager {
FakeItem.register(plugin); FakeItem.register(plugin);
plugin.getLogger().info("虚拟悬浮物功能测试正常..."); plugin.getLogger().info("虚拟悬浮物功能测试正常...");
fakeItem = true; fakeItem = true;
} catch (final Exception e) { } catch (final Error | Exception e) {
plugin.getLogger().warning("+========================================="); plugin.getLogger().warning("+=========================================");
plugin.getLogger().warning("| 警告: 虚拟物品启动失败 使用原版悬浮物品..."); plugin.getLogger().warning("| 警告: 虚拟物品启动失败 使用原版悬浮物品...");
plugin.getLogger().warning("+========================================="); plugin.getLogger().warning("+=========================================");

3
src/main/java/org/maxgamer/QuickShop/Shop/ContainerShop.java
View File

@ -702,9 +702,6 @@ public class ContainerShop implements Shop {
disItem.remove(); disItem.remove();
return; return;
} }
if (disItem instanceof FakeItem) {
return;
}
if (disItem.getItem() == null) { if (disItem.getItem() == null) {
disItem.removeDupe(); disItem.removeDupe();
disItem.spawn(); disItem.spawn();

8
src/main/java/org/maxgamer/QuickShop/Shop/FakeItem.java
View File

@ -122,13 +122,7 @@ public class FakeItem implements DisplayItem {
public FakeItem(final ContainerShop containerShop, final ItemStack item) { public FakeItem(final ContainerShop containerShop, final ItemStack item) {
this.itemStack = item; this.itemStack = item;
this.location = containerShop.getLocation().clone().add(0.5, 1.2, 0.5); this.location = containerShop.getLocation().clone().add(0.5, 1, 0.5);
this.eid = getFakeEntityId();
}
public FakeItem(final ItemStack itemStack, final Location loc) {
this.itemStack = itemStack;
this.location = loc;
this.eid = getFakeEntityId(); this.eid = getFakeEntityId();
} }

2
src/main/java/org/maxgamer/QuickShop/Shop/ShopManager.java
View File

@ -304,12 +304,10 @@ public class ShopManager {
final BlockFace bf = info.getLocation().getBlock().getFace(info.getSignBlock()); final BlockFace bf = info.getLocation().getBlock().getFace(info.getSignBlock());
bs.setType(Material.WALL_SIGN); bs.setType(Material.WALL_SIGN);
final Sign sign = (Sign) bs.getData(); final Sign sign = (Sign) bs.getData();
if (sign != null && bf != null) {
sign.setFacingDirection(bf); sign.setFacingDirection(bf);
bs.update(true); bs.update(true);
shop.setSignText(); shop.setSignText();
} }
}
if (shop instanceof ContainerShop) { if (shop instanceof ContainerShop) {
final ContainerShop cs = (ContainerShop) shop; final ContainerShop cs = (ContainerShop) shop;
if (cs.isDoubleShop()) { if (cs.isDoubleShop()) {