v1.8.5 尝试修复玩家背包不还原BUG

SoBadFish · Dec 1, 2022 · 3cebc22 · 3cebc22
1 parent bb882c6
commit 3cebc22
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.sobadfish.bedwar</groupId>
     <artifactId>BedWar</artifactId>
-    <version>1.8.4</version>
+    <version>1.8.5</version>
 
     <dependencies>
         <dependency>

diff --git a/src/main/java/org/sobadfish/bedwar/player/PlayerInfo.java b/src/main/java/org/sobadfish/bedwar/player/PlayerInfo.java
@@ -7,8 +7,6 @@
 import cn.nukkit.entity.EntityHuman;
 import cn.nukkit.event.entity.EntityDamageByEntityEvent;
 import cn.nukkit.event.entity.EntityDamageEvent;
-import cn.nukkit.inventory.PlayerEnderChestInventory;
-import cn.nukkit.inventory.PlayerInventory;
 import cn.nukkit.item.*;
 import cn.nukkit.item.enchantment.Enchantment;
 import cn.nukkit.level.Level;
@@ -77,7 +75,7 @@ public class PlayerInfo {
 
 
 
-    public PlayerInventory inventory;
+    public Map<Integer,Item> inventory;
 
     public int damageTime = 0;
 
@@ -90,7 +88,7 @@ public class PlayerInfo {
      */
     public int exp;
 
-    public PlayerEnderChestInventory eInventory;
+    public Map<Integer,Item> eInventory;
 
 
     public LinkedHashMap<Integer,Item> armor = new LinkedHashMap<Integer,Item>(){
@@ -860,8 +858,8 @@ public void death(EntityDamageEvent event){
      * */
     public void init(){
         if(BedWarMain.getBedWarMain().getConfig().getBoolean("save-playerInventory",true)){
-            inventory = getPlayer().getInventory();
-            eInventory = getPlayer().getEnderChestInventory();
+            inventory = getPlayer().getInventory().getContents();
+            eInventory = getPlayer().getEnderChestInventory().getContents();
         }
         getPlayer().setHealth(getPlayer().getMaxHealth());
         if(getPlayer() instanceof Player) {
@@ -1002,8 +1000,8 @@ public void clear(){
                 player.setHealth(player.getMaxHealth());
                 ((Player) player).setExperience(0,0);
                 if(inventory != null && eInventory != null){
-                    player.getInventory().setContents(inventory.getContents());
-                    player.getEnderChestInventory().setContents(eInventory.getContents());
+                    player.getInventory().setContents(inventory);
+                    player.getEnderChestInventory().setContents(eInventory);
                 }
                 if(getPlayer() instanceof Player) {
                     ((Player) getPlayer()).setGamemode(0);

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: BedWar
 main: org.sobadfish.bedwar.BedWarMain
-version: 1.8.4
+version: 1.8.5
 api:
   - 1.0.11
   - 3.0.0