mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-23 00:39:16 +00:00
774a111315
I'll make some changes now, so skipping build Changelog: * add CarpetFixes optimizations * fix optimizations config * lithium optimizations * add Carpet Fixes Sheep Optimization * add Async Pathfinding; add C2ME opts math * add 2 vmp patches * New performance patches; update README and wiki README * update configuration on wiki * update wiki main page * Updated Upstream (Purpur) * fix conflicts * make "Don't save Fireworks" patch configurable * Disable memory reserve allocating * Fix MC-172801 * resolve conflicts * add bstats to readme * dd custom list of forks * update logo link
63 lines
3.2 KiB
Diff
63 lines
3.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
|
|
Date: Sun, 25 Jun 2023 22:54:47 +0300
|
|
Subject: [PATCH] Fix MC-65198
|
|
|
|
Original post on Mojira: https://bugs.mojang.com/browse/MC-65198
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
|
|
index 3756de835ea87e3a4fb87cbf77365ffd87957ea9..e5f40f0a8702c98914384e9ffd204da888f39262 100644
|
|
--- a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
|
|
+++ b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
|
|
@@ -141,6 +141,7 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu {
|
|
ItemStack itemstack1 = slot1.getItem();
|
|
|
|
itemstack = itemstack1.copy();
|
|
+ ItemStack itemStack2 = itemstack.copy();
|
|
int j = this.getInventorySlotStart();
|
|
int k = this.getUseRowEnd();
|
|
|
|
@@ -179,7 +180,7 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu {
|
|
}
|
|
|
|
this.activeQuickItem = itemstack; // Purpur
|
|
- slot1.onTake(player, itemstack1);
|
|
+ slot1.onTake(player, itemStack2); // DivineMC - Fix MC-65198
|
|
this.activeQuickItem = null; // Purpur
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/inventory/ResultSlot.java b/src/main/java/net/minecraft/world/inventory/ResultSlot.java
|
|
index 245731757f2593c736916ac6ee59e2c91d179934..537991e3b46d65f4313c42997d7f199a2796241b 100644
|
|
--- a/src/main/java/net/minecraft/world/inventory/ResultSlot.java
|
|
+++ b/src/main/java/net/minecraft/world/inventory/ResultSlot.java
|
|
@@ -45,7 +45,7 @@ public class ResultSlot extends Slot {
|
|
@Override
|
|
protected void checkTakeAchievements(ItemStack stack) {
|
|
if (this.removeCount > 0) {
|
|
- stack.onCraftedBy(this.player.level(), this.player, this.removeCount);
|
|
+ stack.onCraftedBy(this.player.level(), this.player, stack.getCount()); // DivineMC - Fix MC-65198
|
|
}
|
|
|
|
Container var3 = this.container;
|
|
diff --git a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
|
|
index eade15820dd9db38b6af2a5c4314acfb14ca03e9..3cb6a347b3269cb8b451798c7d1606227ebca007 100644
|
|
--- a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
|
|
+++ b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
|
|
@@ -259,6 +259,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
|
|
Item item = itemstack1.getItem();
|
|
|
|
itemstack = itemstack1.copy();
|
|
+ ItemStack itemStack2 = itemstack.copy(); // DivineMC - Fix MC-65198
|
|
if (slot == 1) {
|
|
item.onCraftedBy(itemstack1, player.level(), player);
|
|
if (!this.moveItemStackTo(itemstack1, 2, 38, true)) {
|
|
@@ -291,7 +292,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
|
|
return ItemStack.EMPTY;
|
|
}
|
|
|
|
- slot1.onTake(player, itemstack1);
|
|
+ slot1.onTake(player, itemStack2); // DivineMC - Fix MC-65198
|
|
this.broadcastChanges();
|
|
}
|
|
|