Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-24 19:45:43 +01:00
Code Issues Projects Releases Wiki Activity

Backwards compatibility fix

Browse Source
This commit is contained in:
Daniel Saukel 2016-09-27 13:14:29 +02:00
parent 9bfa5876d2
commit 2c1ff4af65
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/io/github/dre2n/dungeonsxl/command/EditCommand.java
View File

@ -63,6 +63,7 @@ public class EditCommand extends BRCommand {
return;
}
org.bukkit.Bukkit.broadcastMessage(resource.getConfig().getInvitedPlayers().toString());
if (!resource.isInvitedPlayer(player) && !DPermissions.hasPermission(player, DPermissions.EDIT)) {
MessageUtil.sendMessage(player, DMessages.ERROR_NO_PERMISSIONS.getMessage());
return;

7
core/src/main/java/io/github/dre2n/dungeonsxl/config/PlayerData.java
View File

@ -16,6 +16,8 @@
*/
package io.github.dre2n.dungeonsxl.config;
import io.github.dre2n.commons.compatibility.CompatibilityHandler;
import io.github.dre2n.commons.compatibility.Internals;
import io.github.dre2n.commons.config.BRConfig;
import io.github.dre2n.commons.util.EnumUtil;
import io.github.dre2n.commons.util.messageutil.MessageUtil;
@ -42,6 +44,7 @@ import org.bukkit.potion.PotionEffect;
public class PlayerData extends BRConfig {
DungeonsXL plugin = DungeonsXL.getInstance();
boolean is1_9 = Internals.andHigher(Internals.v1_9_R1).contains(CompatibilityHandler.getInstance().getInternals());
public static final int CONFIG_VERSION = 2;
@ -379,7 +382,9 @@ public class PlayerData extends BRConfig {
oldLvl = player.getLevel();
oldArmor = new ArrayList<>(Arrays.asList(player.getInventory().getArmorContents()));
oldInventory = new ArrayList<>(Arrays.asList(player.getInventory().getContents()));
oldOffHand = player.getInventory().getItemInOffHand();
if (is1_9) {
oldOffHand = player.getInventory().getItemInOffHand();
}
oldLocation = player.getLocation();
oldPotionEffects = player.getActivePotionEffects();