Skip to content

Commit 9e5080f

Browse files
committed
Updates
1 parent 8044a9a commit 9e5080f

File tree

2 files changed

+21
-22
lines changed

2 files changed

+21
-22
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'eclipse'
33

44
sourceCompatibility = 1.8
55
targetCompatibility = 1.8
6-
version = '0.5'
6+
version = '0.6'
77
group = "io.github.hsyyid"
88
archivesBaseName = "AdminShop"
99

src/main/java/io/github/hsyyid/adminshop/Main.java

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,17 @@
11
package io.github.hsyyid.adminshop;
22

3+
import com.erigitic.config.AccountManager;
4+
import com.erigitic.main.TotalEconomy;
5+
import com.google.gson.Gson;
6+
import com.google.gson.GsonBuilder;
7+
import com.google.inject.Inject;
38
import io.github.hsyyid.adminshop.cmdexecutors.SetItemShopExecutor;
49
import io.github.hsyyid.adminshop.utils.AdminShop;
510
import io.github.hsyyid.adminshop.utils.LocationAdapter;
611
import io.github.hsyyid.adminshop.utils.ShopItem;
7-
8-
import java.io.BufferedWriter;
9-
import java.io.File;
10-
import java.io.FileWriter;
11-
import java.io.IOException;
12-
import java.math.BigDecimal;
13-
import java.nio.charset.Charset;
14-
import java.nio.charset.StandardCharsets;
15-
import java.nio.file.Files;
16-
import java.nio.file.Paths;
17-
import java.util.ArrayList;
18-
import java.util.Arrays;
19-
2012
import ninja.leaping.configurate.ConfigurationNode;
2113
import ninja.leaping.configurate.commented.CommentedConfigurationNode;
2214
import ninja.leaping.configurate.loader.ConfigurationLoader;
23-
2415
import org.slf4j.Logger;
2516
import org.spongepowered.api.Game;
2617
import org.spongepowered.api.block.BlockTransaction;
@@ -45,13 +36,19 @@
4536
import org.spongepowered.api.world.TeleportHelper;
4637
import org.spongepowered.api.world.World;
4738

48-
import com.erigitic.config.AccountManager;
49-
import com.erigitic.main.TotalEconomy;
50-
import com.google.gson.Gson;
51-
import com.google.gson.GsonBuilder;
52-
import com.google.inject.Inject;
39+
import java.io.BufferedWriter;
40+
import java.io.File;
41+
import java.io.FileWriter;
42+
import java.io.IOException;
43+
import java.math.BigDecimal;
44+
import java.nio.charset.Charset;
45+
import java.nio.charset.StandardCharsets;
46+
import java.nio.file.Files;
47+
import java.nio.file.Paths;
48+
import java.util.ArrayList;
49+
import java.util.Arrays;
5350

54-
@Plugin(id = "AdminShop", name = "AdminShop", version = "0.4", dependencies = "required-after:TotalEconomy")
51+
@Plugin(id = "AdminShop", name = "AdminShop", version = "0.6", dependencies = "required-after:TotalEconomy")
5552
public class Main
5653
{
5754
public static Game game = null;
@@ -409,9 +406,11 @@ public void onPlayerInteractBlock(InteractBlockEvent event)
409406
if (event.getTargetBlock().getState().getType() != null && (event.getTargetBlock().getState().getType() == BlockTypes.WALL_SIGN || event.getTargetBlock().getState().getType() == BlockTypes.STANDING_SIGN))
410407
{
411408
AdminShop thisShop = null;
409+
412410
for (AdminShop chestShop : adminShops)
413411
{
414-
if (chestShop.getSignLocation().getX() == event.getTargetBlock().getLocation().get().getX() && chestShop.getSignLocation().getY() == event.getTargetBlock().getLocation().get().getY() && chestShop.getSignLocation().getZ() == event.getTargetBlock().getLocation().get().getZ())
412+
if (chestShop.getSignLocation()!= null &&
413+
chestShop.getSignLocation().getX() == event.getTargetBlock().getLocation().get().getX() && chestShop.getSignLocation().getY() == event.getTargetBlock().getLocation().get().getY() && chestShop.getSignLocation().getZ() == event.getTargetBlock().getLocation().get().getZ())
415414
{
416415
thisShop = chestShop;
417416
}

0 commit comments

Comments
 (0)