From a2c92d9150d0b8c37cd3dcd819de586ea55e36b9 Mon Sep 17 00:00:00 2001
From: youpaishidifu <1@ypshidifu.cn>
Date: Mon, 26 Oct 2026 20:11:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC57=E6=89=B9=E7=BB=AD11=EF=BC=9APVP?=
 =?UTF-8?q?=E5=BC=83=E7=94=A8API=E4=BF=AE=E5=A4=8D=EF=BC=88Paper=2026.x?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- GameRule.DO_DAYLIGHT_CYCLE → GameRules.ADVANCE_TIME
- GameRule.DO_WEATHER_CYCLE → GameRules.ADVANCE_WEATHER
- GameRule.DO_MOB_SPAWNING → GameRules.SPAWN_MONSTERS
- GameRule.KEEP_INVENTORY → GameRules.KEEP_INVENTORY
- AttributeModifier(String,...) → AttributeModifier(NamespacedKey,...)
---
 src/main/java/Sdf1_login/PVPArenaManager.java |  4 ++--
 src/main/java/Sdf1_login/PVPTestManager.java  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/Sdf1_login/PVPArenaManager.java b/src/main/java/Sdf1_login/PVPArenaManager.java
index 1af046f..74c1505 100644
--- a/src/main/java/Sdf1_login/PVPArenaManager.java
+++ b/src/main/java/Sdf1_login/PVPArenaManager.java
@@ -550,8 +550,8 @@ public class PVPArenaManager implements Listener {
         w.setPVP(true);
         // ★ 和平模式：排除敌对生物干扰PVP
         w.setDifficulty(Difficulty.PEACEFUL);
-        w.setGameRule(GameRule.DO_DAYLIGHT_CYCLE, false);
-        w.setGameRule(GameRule.DO_WEATHER_CYCLE, false);
+        w.setGameRule(GameRules.ADVANCE_TIME, false);
+        w.setGameRule(GameRules.ADVANCE_WEATHER, false);
         w.setTime(6000);
         // ★ 不常驻出生点区块（与 WorldCreator.keepSpawnInMemory(false) 一致），避免同步加载区块卡主线程
         w.setKeepSpawnInMemory(false);
diff --git a/src/main/java/Sdf1_login/PVPTestManager.java b/src/main/java/Sdf1_login/PVPTestManager.java
index 7178f8a..cebb8b9 100644
--- a/src/main/java/Sdf1_login/PVPTestManager.java
+++ b/src/main/java/Sdf1_login/PVPTestManager.java
@@ -182,10 +182,10 @@ public class PVPTestManager implements Listener {
         // 世界规则：常昼 / 无天气 / 关闭自然刷怪（只有我们生成的练习生物）/ PVP 开启
         // ★ KEEP_INVENTORY=false：死亡掉落由事件处理器清空掉落物+复活时还原，避免gamerule与事件冲突
         w.setPVP(true);
-        w.setGameRule(GameRule.DO_DAYLIGHT_CYCLE, false);
-        w.setGameRule(GameRule.DO_WEATHER_CYCLE, false);
-        w.setGameRule(GameRule.DO_MOB_SPAWNING, false);
-        w.setGameRule(GameRule.KEEP_INVENTORY, false);
+        w.setGameRule(GameRules.ADVANCE_TIME, false);
+        w.setGameRule(GameRules.ADVANCE_WEATHER, false);
+        w.setGameRule(GameRules.SPAWN_MONSTERS, false);
+        w.setGameRule(GameRules.KEEP_INVENTORY, false);
         w.setTime(6000);
         w.setKeepSpawnInMemory(false);
 
@@ -895,7 +895,7 @@ public class PVPTestManager implements Listener {
                     // 抵消皮革帽自带的1点护甲，使其不增加玩家对练习生物的伤害减免(纯用于挡太阳)
                     hm.addAttributeModifier(Attribute.ARMOR,
                             new AttributeModifier(
-                                    "pvp_test_no_armor", -1.0,
+                                    new NamespacedKey(plugin, "pvp_test_no_armor"), -1.0,
                                     AttributeModifier.Operation.ADD_NUMBER));
                     hat.setItemMeta(hm);
                 }