Fix PlayerChangeGameModeEvent (#8441)

This commit is contained in:
Take Weiland authored and GitHub committed 2022-02-04 00:08:41 +00:00
1 parent 5c9258491f
commit 5e295f2485
3 files changed
+27 -8

No files matched your search

@@ -134,11 +134,12 @@
}
protected void m_142540_(MobEffectInstance p_143393_, @Nullable Entity p_143394_) {
@@ -1181,6 +_,7 @@
@@ -1181,6 +_,8 @@
}
public boolean m_143403_(GameType p_143404_) {
+ if (!net.minecraftforge.common.ForgeHooks.onChangeGameMode(this, this.f_8941_.m_9290_(), p_143404_)) return false;
+ p_143404_ = net.minecraftforge.common.ForgeHooks.onChangeGameType(this, this.f_8941_.m_9290_(), p_143404_);
+ if (p_143404_ == null) return false;
if (!this.f_8941_.m_143473_(p_143404_)) {
return false;
} else {
@@ -1,6 +1,6 @@
/*
* Minecraft Forge
* Copyright (c) 2016-2021.
* Copyright (c) 2016-2022.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -768,15 +768,25 @@ public class ForgeHooks
MinecraftForge.EVENT_BUS.post(new PlayerInteractEvent.LeftClickEmpty(player));
}
@Deprecated(forRemoval = true, since = "1.18")
public static boolean onChangeGameMode(Player player, GameType currentGameMode, GameType newGameMode)
{
if (currentGameMode != newGameMode)
return onChangeGameType(player, currentGameMode, newGameMode) != null;
}
/**
* @return null if game type should not be changed, desired new GameType otherwise
*/
@Nullable
public static GameType onChangeGameType(Player player, GameType currentGameType, GameType newGameType)
{
if (currentGameType != newGameType)
{
PlayerEvent.PlayerChangeGameModeEvent evt = new PlayerEvent.PlayerChangeGameModeEvent(player, currentGameMode, newGameMode);
PlayerEvent.PlayerChangeGameModeEvent evt = new PlayerEvent.PlayerChangeGameModeEvent(player, currentGameType, newGameType);
MinecraftForge.EVENT_BUS.post(evt);
return !evt.isCanceled();
return evt.isCanceled() ? null : evt.getNewGameMode();
}
return true;
return newGameType;
}
private static ThreadLocal<Deque<LootTableContext>> lootContext = new ThreadLocal<Deque<LootTableContext>>();
@@ -1,6 +1,6 @@
/*
* Minecraft Forge
* Copyright (c) 2016-2021.
* Copyright (c) 2016-2022.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -41,8 +41,16 @@ public class PlayerGameModeEventTest
{
if (!ENABLE) return;
LOGGER.info("{} changed game mode. Current GameType: {}. New Game Type: {}", event.getPlayer(), event.getCurrentGameMode(), event.getNewGameMode());
// prevent changing to SURVIVAL
if (event.getNewGameMode() == GameType.SURVIVAL)
{
event.setCanceled(true);
}
else if (event.getNewGameMode() == GameType.SPECTATOR)
{
// when changing to SPECTATOR, change to SURVIVAL instead
event.setNewGameMode(GameType.SURVIVAL);
}
}
@Mod.EventBusSubscriber(modid="player_game_mode_event_test", value=Dist.CLIENT, bus=Mod.EventBusSubscriber.Bus.FORGE)