forked from Upstream/VillagerTradeLimiter
Version 1.2.1:
* Fixed NullPointerException when using "/vtl reload" from the console
This commit is contained in:
parent
4c12bb4bda
commit
960fd1c535
2
pom.xml
2
pom.xml
@ -3,7 +3,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>com.pretzel.dev</groupId>
|
<groupId>com.pretzel.dev</groupId>
|
||||||
<artifactId>VillagerTradeLimiter</artifactId>
|
<artifactId>VillagerTradeLimiter</artifactId>
|
||||||
<version>1.2.0</version>
|
<version>1.2.1</version>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<java.version>1.8</java.version>
|
<java.version>1.8</java.version>
|
||||||
|
@ -57,7 +57,7 @@ public class VillagerTradeLimiter extends JavaPlugin {
|
|||||||
final CommandBase vtl = new CommandBase("villagertradelimiter", "villagertradelimiter.use", p -> this.help(p));
|
final CommandBase vtl = new CommandBase("villagertradelimiter", "villagertradelimiter.use", p -> this.help(p));
|
||||||
vtl.addSub(new CommandBase("reload", "villagertradelimiter.reload", p -> {
|
vtl.addSub(new CommandBase("reload", "villagertradelimiter.reload", p -> {
|
||||||
loadSettings();
|
loadSettings();
|
||||||
p.sendMessage(reloaded);
|
if(p != null) p.sendMessage(reloaded);
|
||||||
}));
|
}));
|
||||||
this.getCommand("villagertradelimiter").setExecutor(vtl);
|
this.getCommand("villagertradelimiter").setExecutor(vtl);
|
||||||
this.getCommand("villagertradelimiter").setTabCompleter(vtl);
|
this.getCommand("villagertradelimiter").setTabCompleter(vtl);
|
||||||
|
@ -24,8 +24,8 @@ import java.util.List;
|
|||||||
public class PlayerListener implements Listener {
|
public class PlayerListener implements Listener {
|
||||||
private static final Material[] MATERIALS = new Material[] { Material.IRON_HELMET, Material.IRON_CHESTPLATE, Material.IRON_LEGGINGS, Material.IRON_BOOTS, Material.BELL, Material.CHAINMAIL_HELMET, Material.CHAINMAIL_CHESTPLATE, Material.CHAINMAIL_LEGGINGS, Material.CHAINMAIL_BOOTS, Material.SHIELD, Material.DIAMOND_HELMET, Material.DIAMOND_CHESTPLATE, Material.DIAMOND_LEGGINGS, Material.DIAMOND_BOOTS, Material.FILLED_MAP, Material.FISHING_ROD, Material.LEATHER_HELMET, Material.LEATHER_CHESTPLATE, Material.LEATHER_LEGGINGS, Material.LEATHER_BOOTS, Material.LEATHER_HORSE_ARMOR, Material.SADDLE, Material.ENCHANTED_BOOK, Material.STONE_AXE, Material.STONE_SHOVEL, Material.STONE_PICKAXE, Material.STONE_HOE, Material.IRON_AXE, Material.IRON_SHOVEL, Material.IRON_PICKAXE, Material.DIAMOND_AXE, Material.DIAMOND_SHOVEL, Material.DIAMOND_PICKAXE, Material.DIAMOND_HOE, Material.IRON_SWORD, Material.DIAMOND_SWORD };
|
private static final Material[] MATERIALS = new Material[] { Material.IRON_HELMET, Material.IRON_CHESTPLATE, Material.IRON_LEGGINGS, Material.IRON_BOOTS, Material.BELL, Material.CHAINMAIL_HELMET, Material.CHAINMAIL_CHESTPLATE, Material.CHAINMAIL_LEGGINGS, Material.CHAINMAIL_BOOTS, Material.SHIELD, Material.DIAMOND_HELMET, Material.DIAMOND_CHESTPLATE, Material.DIAMOND_LEGGINGS, Material.DIAMOND_BOOTS, Material.FILLED_MAP, Material.FISHING_ROD, Material.LEATHER_HELMET, Material.LEATHER_CHESTPLATE, Material.LEATHER_LEGGINGS, Material.LEATHER_BOOTS, Material.LEATHER_HORSE_ARMOR, Material.SADDLE, Material.ENCHANTED_BOOK, Material.STONE_AXE, Material.STONE_SHOVEL, Material.STONE_PICKAXE, Material.STONE_HOE, Material.IRON_AXE, Material.IRON_SHOVEL, Material.IRON_PICKAXE, Material.DIAMOND_AXE, Material.DIAMOND_SHOVEL, Material.DIAMOND_PICKAXE, Material.DIAMOND_HOE, Material.IRON_SWORD, Material.DIAMOND_SWORD };
|
||||||
|
|
||||||
private VillagerTradeLimiter instance;
|
private final VillagerTradeLimiter instance;
|
||||||
private NMS nms;
|
private final NMS nms;
|
||||||
|
|
||||||
public PlayerListener(VillagerTradeLimiter instance) {
|
public PlayerListener(VillagerTradeLimiter instance) {
|
||||||
this.instance = instance;
|
this.instance = instance;
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
package com.pretzel.dev.villagertradelimiter.nms;
|
package com.pretzel.dev.villagertradelimiter.nms;
|
||||||
|
|
||||||
import com.pretzel.dev.villagertradelimiter.lib.Util;
|
import com.pretzel.dev.villagertradelimiter.lib.Util;
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#---------------------------------------------------------------------------------#
|
#---------------------------------------------------------------------------------#
|
||||||
# VTL ~ VillagerTradeLimiter #
|
# VTL ~ VillagerTradeLimiter #
|
||||||
# Version: 1.2.0 #
|
# Version: 1.2.1 #
|
||||||
# By: PretzelJohn #
|
# By: PretzelJohn #
|
||||||
#---------------------------------------------------------------------------------#
|
#---------------------------------------------------------------------------------#
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
name: VillagerTradeLimiter
|
name: VillagerTradeLimiter
|
||||||
author: PretzelJohn
|
author: PretzelJohn
|
||||||
main: com.pretzel.dev.villagertradelimiter.VillagerTradeLimiter
|
main: com.pretzel.dev.villagertradelimiter.VillagerTradeLimiter
|
||||||
version: 1.2.0
|
version: 1.2.1
|
||||||
api-version: 1.14
|
api-version: 1.14
|
||||||
|
|
||||||
commands:
|
commands:
|
||||||
|
Loading…
Reference in New Issue
Block a user