Upstream/UltimateKits
1
0
Fork 0
mirror of https://github.com/songoda/UltimateKits.git synced 2024-11-29 21:53:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development' into 'master'

Browse Source 
Development

See merge request Songoda/ultimatekits!36
This commit is contained in:
Brianna O'Keefe 2019-05-03 21:36:08 +00:00
commit d351f0d69a
4 changed files with 7 additions and 3 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: "UltimateKits" name: "UltimateKits"
path: "/builds/$CI_PROJECT_PATH" path: "/builds/$CI_PROJECT_PATH"
version: "2.3.2" version: "2.3.3"
build: build:
stage: build stage: build

3
src/main/java/com/songoda/ultimatekits/handlers/ParticleHandler.java
View File

@ -34,8 +34,9 @@ public class ParticleHandler {
Location location = kitBlockData.getLocation(); Location location = kitBlockData.getLocation();
location.add(.5, 0, .5); location.add(.5, 0, .5);
if (plugin.isServerVersionAtLeast(ServerVersion.V1_8)) if (plugin.isServerVersionAtLeast(ServerVersion.V1_9))
location.getWorld().spawnParticle(org.bukkit.Particle.valueOf(type), location, amt, 0.25, 0.25, 0.25); location.getWorld().spawnParticle(org.bukkit.Particle.valueOf(type), location, amt, 0.25, 0.25, 0.25);
} }
} catch (Exception ex) { } catch (Exception ex) {

1
src/main/java/com/songoda/ultimatekits/hologram/Hologram.java
View File

@ -70,6 +70,7 @@ public abstract class Hologram {
} }
private void format(KitBlockData data, Action action) { private void format(KitBlockData data, Action action) {
if (data == null) return;
KitType kitType = data.getType(); KitType kitType = data.getType();
ArrayList<String> lines = new ArrayList<>(); ArrayList<String> lines = new ArrayList<>();

4
src/main/java/com/songoda/ultimatekits/utils/gui/AbstractAnvilGUI.java
View File

@ -1,6 +1,7 @@
package com.songoda.ultimatekits.utils.gui; package com.songoda.ultimatekits.utils.gui;
import com.songoda.ultimatekits.UltimateKits; import com.songoda.ultimatekits.UltimateKits;
import com.songoda.ultimatekits.utils.ServerVersion;
import com.songoda.ultimatekits.utils.version.NMSUtil; import com.songoda.ultimatekits.utils.version.NMSUtil;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Sound; import org.bukkit.Sound;
@ -110,7 +111,8 @@ public class AbstractAnvilGUI {
player.setLevel(player.getLevel() - 1); player.setLevel(player.getLevel() - 1);
if (inv.equals(inv)) { if (inv.equals(inv)) {
inv.clear(); inv.clear();
player.playSound(player.getLocation(), closeSound, 1F, 1F); if (UltimateKits.getInstance().isServerVersionAtLeast(ServerVersion.V1_9))
player.playSound(player.getLocation(), closeSound, 1F, 1F);
Bukkit.getScheduler().scheduleSyncDelayedTask(UltimateKits.getInstance(), () -> { Bukkit.getScheduler().scheduleSyncDelayedTask(UltimateKits.getInstance(), () -> {
if (onClose != null) onClose.OnClose(player, inv); if (onClose != null) onClose.OnClose(player, inv);
destroy(); destroy();