diff --git a/gradle.properties b/gradle.properties index a862448..b160f7c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ apiVersion=1.21.11 release=1 # 0 for skip release, 1 for pre-release, 2 for release -luminolRef=027661a316ca569685ddf7214094e3d6f2dc77d8 +luminolRef=bb238e15f9ab8ac13b9032dadb02dcdcf7d4332c org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-server/minecraft-patches/features/0031-Leaves-Replay-Mod-API.patch b/lophine-server/minecraft-patches/features/0031-Leaves-Replay-Mod-API.patch index 3fca214..783a58e 100644 --- a/lophine-server/minecraft-patches/features/0031-Leaves-Replay-Mod-API.patch +++ b/lophine-server/minecraft-patches/features/0031-Leaves-Replay-Mod-API.patch @@ -328,7 +328,7 @@ index b88f669535f050605e3b5739501ef6d5caee4238..5e08d8b9c7f1869965be0ee5761bbc40 if (new org.bukkit.event.player.PlayerGameModeChangeEvent(this.getBukkitEntity(), org.bukkit.GameMode.getByValue(this.server.getDefaultGameType().getId()), org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.DEFAULT_GAMEMODE, null).callEvent()) { this.gameMode.setGameModeForPlayer(this.server.getForcedGameType(), GameType.DEFAULT_MODE); diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index 36cd1a0307ff1a734eb5f4f3cc013781692e7ad8..e38f5ae03f184696a3d68542c0bde3b1091dfd2e 100644 +index 36cd1a0307ff1a734eb5f4f3cc013781692e7ad8..0c3e6c1f70289c63bfe424a49374602f25ff5c0b 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java @@ -130,6 +130,7 @@ public abstract class PlayerList { @@ -356,7 +356,7 @@ index 36cd1a0307ff1a734eb5f4f3cc013781692e7ad8..e38f5ae03f184696a3d68542c0bde3b1 + + LevelData worlddata = worldserver1.getLevelData(); + -+ player.loadGameTypes(null); ++ //player.loadGameTypes(null); // simply fix for https://github.com/MC-XiaoHei/ISeeYou/issues/70 + ServerGamePacketListenerImpl playerconnection = new ServerGamePacketListenerImpl(this.server, connection, player, CommonListenerCookie.createInitial(player.gameProfile, false)); + GameRules gamerules = worldserver1.getGameRules(); + boolean flag = gamerules.get(GameRules.IMMEDIATE_RESPAWN);