zhdev/griefus
1
0
Fork 0
Code Issues Pull requests Activity

Fixed inventory lookups not returning correct item for planted seeds

Browse source
This commit is contained in:
Intelli 2022-02-24 20:52:30 -07:00
parent ddb804ce99
commit 900cad643f
4 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/net/coreprotect/database/Lookup.java
View file

@ -234,10 +234,8 @@ public class Lookup extends Queue {
resultData = results.getInt("data");
resultAmount = results.getInt("amount");
resultMeta = results.getBytes("metadata");
if (!lookup) {
resultTable = results.getInt("tbl");
hasTbl = true;
}
resultTable = results.getInt("tbl");
hasTbl = true;
}
else {
resultData = results.getInt("data");

2
src/main/java/net/coreprotect/database/Rollback.java
View file

@ -1053,7 +1053,7 @@ public class Rollback extends Queue {
int rolledBackInventory = Util.rolledBack((Integer) row[9], true);
if (rowType != null) {
if (inventoryRollback && ((rollbackType == 0 && rolledBackInventory == 0) || (rollbackType == 1 && rolledBackInventory == 1))) {
Material inventoryItem = Util.itemFilter(rowType);
Material inventoryItem = Util.itemFilter(rowType, ((Integer) row[14] == 0));
int rowUserId = (Integer) row[2];
String rowUser = ConfigHandler.playerIdCacheReversed.get(rowUserId);
if (rowUser == null) {