dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed crash when moving a wireless item with the number keys. Fixes #1766

Browse Source
This commit is contained in:
raoulvdberge
2018-06-26 23:56:39 +02:00
parent f69feacd68
commit 89b7d2bfc8
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -23,6 +23,7 @@ NOTE: Worlds that used Refined Storage 1.5.x are fully compatible with Refined S
- Fixed bug where Crafting Upgrade on Interface kept too many items in stock (raoulvdberge) - Fixed bug where Crafting Upgrade on Interface kept too many items in stock (raoulvdberge)
- Fixed bug where External Storage could only handle 1 fluid inventory per block (raoulvdberge) - Fixed bug where External Storage could only handle 1 fluid inventory per block (raoulvdberge)
- Fixed shift clicking a created pattern going into Grid inventory (raoulvdberge) - Fixed shift clicking a created pattern going into Grid inventory (raoulvdberge)
- Fixed crash when moving a wireless item with the number keys (raoulvdberge)
- Prevent accidental Grid scrollbar click after clicking JEI recipe transfer button (raoulvdberge) - Prevent accidental Grid scrollbar click after clicking JEI recipe transfer button (raoulvdberge)
- Added a missing config option for Crafter Manager energy usage (raoulvdberge) - Added a missing config option for Crafter Manager energy usage (raoulvdberge)
- Added support for Disk Drive / Storage Block storage and capacity to OC integration (zangai) - Added support for Disk Drive / Storage Block storage and capacity to OC integration (zangai)

8
src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java
View File

@@ -49,7 +49,7 @@ public abstract class ContainerBase extends Container {
int x = xInventory + i * 18; int x = xInventory + i * 18;
int y = yInventory + 4 + (3 * 18); int y = yInventory + 4 + (3 * 18);
if (i == player.inventory.currentItem && isHeldItemDisabled()) { if (isHeldItemDisabled() && i == player.inventory.currentItem) {
addSlotToContainer(new SlotDisabled(player.inventory, id, x, y)); addSlotToContainer(new SlotDisabled(player.inventory, id, x, y));
} else { } else {
addSlotToContainer(new Slot(player.inventory, id, x, y)); addSlotToContainer(new Slot(player.inventory, id, x, y));
@@ -71,6 +71,12 @@ public abstract class ContainerBase extends Container {
public ItemStack slotClick(int id, int dragType, ClickType clickType, EntityPlayer player) { public ItemStack slotClick(int id, int dragType, ClickType clickType, EntityPlayer player) {
Slot slot = id >= 0 ? getSlot(id) : null; Slot slot = id >= 0 ? getSlot(id) : null;
// Prevent swapping disabled held item with the number keys
// (dragType is the slot we're swapping with)
if (isHeldItemDisabled() && clickType == ClickType.SWAP && dragType == player.inventory.currentItem) {
return ItemStack.EMPTY;
}
if (slot instanceof SlotFilter) { if (slot instanceof SlotFilter) {
if (slot.getStack().getItem() == RSItems.FILTER) { if (slot.getStack().getItem() == RSItems.FILTER) {
return super.slotClick(id, dragType, clickType, player); return super.slotClick(id, dragType, clickType, player);