|
1 | 1 | package io.github.hsyyid.adminshop; |
2 | 2 |
|
| 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; |
3 | 8 | import io.github.hsyyid.adminshop.cmdexecutors.SetItemShopExecutor; |
4 | 9 | import io.github.hsyyid.adminshop.utils.AdminShop; |
5 | 10 | import io.github.hsyyid.adminshop.utils.LocationAdapter; |
6 | 11 | 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 | | - |
20 | 12 | import ninja.leaping.configurate.ConfigurationNode; |
21 | 13 | import ninja.leaping.configurate.commented.CommentedConfigurationNode; |
22 | 14 | import ninja.leaping.configurate.loader.ConfigurationLoader; |
23 | | - |
24 | 15 | import org.slf4j.Logger; |
25 | 16 | import org.spongepowered.api.Game; |
26 | 17 | import org.spongepowered.api.block.BlockTransaction; |
|
45 | 36 | import org.spongepowered.api.world.TeleportHelper; |
46 | 37 | import org.spongepowered.api.world.World; |
47 | 38 |
|
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; |
53 | 50 |
|
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") |
55 | 52 | public class Main |
56 | 53 | { |
57 | 54 | public static Game game = null; |
@@ -409,9 +406,11 @@ public void onPlayerInteractBlock(InteractBlockEvent event) |
409 | 406 | if (event.getTargetBlock().getState().getType() != null && (event.getTargetBlock().getState().getType() == BlockTypes.WALL_SIGN || event.getTargetBlock().getState().getType() == BlockTypes.STANDING_SIGN)) |
410 | 407 | { |
411 | 408 | AdminShop thisShop = null; |
| 409 | + |
412 | 410 | for (AdminShop chestShop : adminShops) |
413 | 411 | { |
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()) |
415 | 414 | { |
416 | 415 | thisShop = chestShop; |
417 | 416 | } |
|
0 commit comments