Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into feat/postgresql-database

Browse Source 
# Conflicts:
#	config.yaml
#	src/main/java/config/ServerConfig.java
This commit is contained in:
P0nk
2023-11-08 21:21:07 +01:00
parent 392a350eab 03802666ef
commit 033d91ed71
13 changed files with 166 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/scripting/AbstractPlayerInteraction.java
View File

@@ -298,7 +298,7 @@ public class AbstractPlayerInteraction {
int size = Math.min(itemids.size(), quantity.size());
List<List<Pair<Integer, Integer>>> invList = new ArrayList<>(6);
for (int i = InventoryType.UNDEFINED.getType(); i < InventoryType.CASH.getType(); i++) {
for (int i = InventoryType.UNDEFINED.getType(); i <= InventoryType.CASH.getType(); i++) {
invList.add(new LinkedList<>());
}