icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed so updating of slot and craft requests are only called from main thread.

Browse Source
This commit is contained in:
gnembon committed 2020-07-15 00:25:51 -03:00
1 parent f871a5d473
commit f397a59579
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java
+3 -3
View File
@@ -225,13 +225,13 @@ public class ServerPlayNetworkHandler_scarpetEventsMixin
PLAYER_ATTACKS_ENTITY.onEntityAction(player, playerInteractEntityC2SPacket_1.getEntity(player.getServerWorld()), null); PLAYER_ATTACKS_ENTITY.onEntityAction(player, playerInteractEntityC2SPacket_1.getEntity(player.getServerWorld()), null);
} }
@Inject(method = "onButtonClick", at = @At("HEAD")) @Inject(method = "onButtonClick", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;updateLastActionTime()V"))
private void onItemBeingPickedFromInventory(ButtonClickC2SPacket packet, CallbackInfo ci) private void onItemBeingPickedFromInventory(ButtonClickC2SPacket packet, CallbackInfo ci)
{ {
// crafts not int the crafting window // crafts not int the crafting window
//CarpetSettings.LOG.error("Player clicks button "+packet.getButtonId()); //CarpetSettings.LOG.error("Player clicks button "+packet.getButtonId());
} }
@Inject(method = "onCraftRequest", at = @At("HEAD")) @Inject(method = "onCraftRequest", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;updateLastActionTime()V"))
private void onRecipeSelectedInRecipeManager(CraftRequestC2SPacket packet, CallbackInfo ci) private void onRecipeSelectedInRecipeManager(CraftRequestC2SPacket packet, CallbackInfo ci)
{ {
if (PLAYER_CHOOSES_RECIPE.isNeeded()) if (PLAYER_CHOOSES_RECIPE.isNeeded())
@@ -243,7 +243,7 @@ public class ServerPlayNetworkHandler_scarpetEventsMixin
@Inject(method = "onUpdateSelectedSlot", at = @At("HEAD")) @Inject(method = "onUpdateSelectedSlot", at = @At("HEAD"))
private void onUpdatedSelectedSLot(UpdateSelectedSlotC2SPacket packet, CallbackInfo ci) private void onUpdatedSelectedSLot(UpdateSelectedSlotC2SPacket packet, CallbackInfo ci)
{ {
if (PLAYER_SWITCHES_SLOT.isNeeded()) if (PLAYER_SWITCHES_SLOT.isNeeded() && player.getServer() != null && player.getServer().isOnThread())
{ {
PLAYER_SWITCHES_SLOT.onSlotSwitch(player, player.inventory.selectedSlot, packet.getSelectedSlot()); PLAYER_SWITCHES_SLOT.onSlotSwitch(player, player.inventory.selectedSlot, packet.getSelectedSlot());
} }