Upstream/EpicFarming
1
0
Fork 0
mirror of https://github.com/songoda/EpicFarming.git synced 2024-09-29 07:07:29 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2019-10-28 16:18:49 -04:00
commit 8ad0c92fea
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -4,7 +4,7 @@ stages:
variables: variables:
name: "EpicFarming" name: "EpicFarming"
path: "/builds/$CI_PROJECT_PATH" path: "/builds/$CI_PROJECT_PATH"
version: "3.0.4" version: "3.0.5"
build: build:
stage: build stage: build

2
src/main/java/com/songoda/epicfarming/EpicFarming.java
View File

@ -160,8 +160,6 @@ public class EpicFarming extends SongodaPlugin {
// Adding in Boosts // Adding in Boosts
if (storage.containsGroup("boosts")) { if (storage.containsGroup("boosts")) {
for (StorageRow row : storage.getRowsByGroup("boosts")) { for (StorageRow row : storage.getRowsByGroup("boosts")) {
if (row.getItems().get("player").asObject() != null)
continue;
BoostData boostData = new BoostData( BoostData boostData = new BoostData(
row.get("amount").asInt(), row.get("amount").asInt(),

10
src/main/java/com/songoda/epicfarming/storage/StorageItem.java
View File

@ -22,12 +22,12 @@ public class StorageItem {
this.object = object; this.object = object;
} }
public StorageItem(String key, List<ItemStack> material) { public StorageItem(String key, List<ItemStack> items) {
if (material == null || material.isEmpty()) return; if (items == null || items.isEmpty()) return;
StringBuilder object = new StringBuilder(); StringBuilder object = new StringBuilder();
for (ItemStack m : material) { for (ItemStack item : items) {
if (m == null) continue; if (item == null) continue;
object.append(Serializers.serialize(m)); object.append(Serializers.serialize(item));
object.append(";;"); object.append(";;");
} }
this.key = key; this.key = key;