diff --git a/libHook/DemonWarps.jar b/libHook/DemonWarps.jar new file mode 100644 index 0000000..d6569d9 Binary files /dev/null and b/libHook/DemonWarps.jar differ diff --git a/src/main/java/com/yaohun/storyline/gui/DialogueGui.java b/src/main/java/com/yaohun/storyline/gui/DialogueGui.java index 7b17f02..0b9b220 100644 --- a/src/main/java/com/yaohun/storyline/gui/DialogueGui.java +++ b/src/main/java/com/yaohun/storyline/gui/DialogueGui.java @@ -7,7 +7,7 @@ import com.yaohun.storyline.data.DialogueData; import com.yaohun.storyline.data.PlayerData; import com.yaohun.storyline.manage.PlayerManager; import com.yaohun.storyline.manage.QuestManager; -import de.tr7zw.itemnbtapi.NBTItem; +import me.Demon.DemonPlugin.data.NbtItem; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -36,7 +36,7 @@ public class DialogueGui implements Listener { ItemMeta meta = stack.getItemMeta(); meta.setDisplayName(dialogueData.getPlayerContent()); stack.setItemMeta(meta); - NBTItem nbtItem = new NBTItem(stack); + NbtItem nbtItem = new NbtItem(stack); nbtItem.setInteger("dialogueID",quest.getQuestID()); inv.setItem(17,nbtItem.getItem()); setNpcDialogueData(inv,dialogueData.getNpcName(),dialogueData.getNpcContent()); @@ -84,7 +84,7 @@ public class DialogueGui implements Listener { event.setCancelled(true); if(rawSlot == 17){ ItemStack item = event.getCurrentItem(); - NBTItem nbtItem = new NBTItem(item); + NbtItem nbtItem = new NbtItem(item); int questID = nbtItem.getInteger("dialogueID"); Quest quest = QuestManager.getQuest(questID); if(quest == null){ diff --git a/src/main/java/com/yaohun/storyline/network/DragonChannel.java b/src/main/java/com/yaohun/storyline/network/DragonChannel.java index 23bb7c2..36cea55 100644 --- a/src/main/java/com/yaohun/storyline/network/DragonChannel.java +++ b/src/main/java/com/yaohun/storyline/network/DragonChannel.java @@ -6,7 +6,6 @@ import com.yaohun.storyline.core.Quest; import com.yaohun.storyline.data.PlayerData; import com.yaohun.storyline.manage.PlayerManager; import com.yaohun.storyline.manage.QuestManager; -import de.tr7zw.itemnbtapi.NBTItem; import eos.moe.dragoncore.DragonCore; import eos.moe.dragoncore.api.CoreAPI; import eos.moe.dragoncore.api.easygui.EasyScreen; diff --git a/src/main/java/com/yaohun/storyline/quest/WarpSendListener.java b/src/main/java/com/yaohun/storyline/quest/WarpSendListener.java index 3a735ab..c47b2e3 100644 --- a/src/main/java/com/yaohun/storyline/quest/WarpSendListener.java +++ b/src/main/java/com/yaohun/storyline/quest/WarpSendListener.java @@ -22,7 +22,7 @@ public class WarpSendListener implements Listener { PlayerManager playerManager = Storyline.getPlayerManager(); PlayerData playerData = playerManager.getPlayerData(playerName); - if(playerData == null) return; + if(playerData == null){ return;} // 玩家若已完成所有任务则直接返回 if(playerData.isAllCompleted()){