From cf380ffe8fa9076c5d5fa5164eb62c09c3a3c9a5 Mon Sep 17 00:00:00 2001 From: Riku Ueda Date: Wed, 24 Nov 2021 22:58:19 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/world/arainu/core/metaverseplugin/MetaversePlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/world/arainu/core/metaverseplugin/MetaversePlugin.java b/src/main/java/world/arainu/core/metaverseplugin/MetaversePlugin.java index 1f47988..3705f2d 100644 --- a/src/main/java/world/arainu/core/metaverseplugin/MetaversePlugin.java +++ b/src/main/java/world/arainu/core/metaverseplugin/MetaversePlugin.java @@ -143,7 +143,7 @@ public void setListener() { PM.registerEvents(new VillagerListener(), this); PM.registerEvents(new CommandWhitelist(), this); DiscordSRV.api.subscribe(this); - getServer().getMessenger().registerOutgoingPluginChannel(this, "Bungeecord"); + getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord"); } /** From eb213a6f0841496d3e21c1e2e0ccce0bf64a3c70 Mon Sep 17 00:00:00 2001 From: Riku Ueda Date: Thu, 25 Nov 2021 00:37:14 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/metaverseplugin/listener/VillagerListener.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/world/arainu/core/metaverseplugin/listener/VillagerListener.java b/src/main/java/world/arainu/core/metaverseplugin/listener/VillagerListener.java index 8bf9ed4..4f067b9 100644 --- a/src/main/java/world/arainu/core/metaverseplugin/listener/VillagerListener.java +++ b/src/main/java/world/arainu/core/metaverseplugin/listener/VillagerListener.java @@ -177,7 +177,7 @@ public void onInventoryClick(InventoryClickEvent e) { } } else { final ReturnMoney returnMoney = getTotalmoney(inv); - final int required_money = guiData.price * Objects.requireNonNull(inv.getItem(2)).getAmount(); + final int required_money = guiData.price * item.getAmount(); if (required_money <= returnMoney.getTotal_money()) { okay = true; for (ItemStack i : returnMoney.getMoney_list()) { @@ -186,7 +186,9 @@ public void onInventoryClick(InventoryClickEvent e) { } } Bank.addMoneyForPlayer((Player) p, returnMoney.getTotal_money() - required_money); - p.getInventory().addItem(Objects.requireNonNull(inv.getItem(2))); + final ItemStack addItem = new ItemStack(item.getType()); + addItem.setAmount(item.getAmount()); + p.getInventory().addItem(addItem); } } if(okay){ From ca2b8429788a0ff6bd577762a6ff92810528f945 Mon Sep 17 00:00:00 2001 From: Riku Ueda Date: Thu, 25 Nov 2021 16:41:20 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arainu/core/metaverseplugin/scheduler/LateScheduler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/world/arainu/core/metaverseplugin/scheduler/LateScheduler.java b/src/main/java/world/arainu/core/metaverseplugin/scheduler/LateScheduler.java index b129a88..db194c3 100644 --- a/src/main/java/world/arainu/core/metaverseplugin/scheduler/LateScheduler.java +++ b/src/main/java/world/arainu/core/metaverseplugin/scheduler/LateScheduler.java @@ -190,6 +190,7 @@ private void update(String type, List> recipeData) { { put("mason-villager", new ArrayList<>(Collections.nCopies(7, 0))); put("stone-villager", new ArrayList<>(Collections.nCopies(47, 0))); + put("sandstone-villager", new ArrayList<>(Collections.nCopies(9, 0))); put("mob-villager", new ArrayList<>(Collections.nCopies(27, 0))); } };