Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-24 11:38:40 +01:00
Code Issues Projects Releases Wiki Activity

Fix issue with loading on old CraftBukkit versions

Browse Source
This commit is contained in:
Luck 2018-02-24 14:04:22 +00:00
parent b2175e885f
commit d0143f9e54
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
2 changed files with 128 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java
View File

@ -29,6 +29,7 @@ import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.LuckPermsApi;
import me.lucko.luckperms.api.platform.PlatformType;
import me.lucko.luckperms.bukkit.calculators.BukkitCalculatorFactory;
import me.lucko.luckperms.bukkit.compat.NullSafeConsoleCommandSender;
import me.lucko.luckperms.bukkit.contexts.BukkitContextManager;
import me.lucko.luckperms.bukkit.contexts.WorldCalculator;
import me.lucko.luckperms.bukkit.listeners.BukkitConnectionListener;
@ -85,6 +86,7 @@ import me.lucko.luckperms.common.tasks.UpdateTask;
import me.lucko.luckperms.common.treeview.PermissionVault;
import me.lucko.luckperms.common.verbose.VerboseHandler;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.command.PluginCommand;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
@ -124,6 +126,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
private LuckPermsApiProvider apiProvider;
private EventFactory eventFactory;
private Logger log;
private ConsoleCommandSender console;
private LPSubscriptionMap subscriptionMap;
private LPPermissionMap permissionMap;
private LPDefaultsMap defaultPermissionMap;
@ -152,6 +155,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
}
// setup minimal functionality in order to load initial dependencies
this.console = new NullSafeConsoleCommandSender(getServer());
this.scheduler = new BukkitSchedulerAdapter(this);
this.localeManager = new NoopLocaleManager();
this.senderFactory = new BukkitSenderFactory(this);
@ -577,7 +581,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
@Override
public Sender getConsoleSender() {
return getSenderFactory().wrap(getServer().getConsoleSender());
return getSenderFactory().wrap(this.console);
}
private static boolean checkInvalidVersion() {

123
bukkit/src/main/java/me/lucko/luckperms/bukkit/compat/NullSafeConsoleCommandSender.java Normal file
View File

@ -0,0 +1,123 @@
/*
* This file is part of LuckPerms, licensed under the MIT License.
*
* Copyright (c) lucko (Luck) <luck@lucko.me>
* Copyright (c) contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package me.lucko.luckperms.bukkit.compat;
import org.bukkit.Server;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.conversations.Conversation;
import org.bukkit.conversations.ConversationAbandonedEvent;
import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionAttachment;
import org.bukkit.permissions.PermissionAttachmentInfo;
import org.bukkit.plugin.Plugin;
import java.util.Optional;
import java.util.Set;
/**
* The {@link Server#getConsoleSender()} method returns null during onEnable
* in older CraftBukkit builds. This prevents LuckPerms from loading correctly.
*/
public class NullSafeConsoleCommandSender implements ConsoleCommandSender {
private final Server server;
public NullSafeConsoleCommandSender(Server server) {
this.server = server;
}
private Optional<ConsoleCommandSender> get() {
return Optional.ofNullable(this.server.getConsoleSender());
}
@Override
public Server getServer() {
return this.server;
}
@Override
public String getName() {
return "CONSOLE";
}
@Override
public void sendMessage(String message) {
Optional<ConsoleCommandSender> console = get();
if (console.isPresent()) {
console.get().sendMessage(message);
} else {
this.server.getLogger().info(message);
}
}
@Override
public void sendMessage(String[] messages) {
for (String msg : messages) {
sendMessage(msg);
}
}
@Override
public boolean isPermissionSet(String s) {
return get().map(c -> c.isPermissionSet(s)).orElse(true);
}
@Override
public boolean isPermissionSet(Permission permission) {
return get().map(c -> c.isPermissionSet(permission)).orElse(true);
}
@Override
public boolean hasPermission(String s) {
return get().map(c -> c.hasPermission(s)).orElse(true);
}
@Override
public boolean hasPermission(Permission permission) {
return get().map(c -> c.hasPermission(permission)).orElse(true);
}
@Override
public boolean isOp() {
return true;
}
// just throw UnsupportedOperationException - we never use any of these methods
@Override public Spigot spigot() { throw new UnsupportedOperationException(); }
@Override public boolean isConversing() { throw new UnsupportedOperationException(); }
@Override public void acceptConversationInput(String s) { throw new UnsupportedOperationException(); }
@Override public boolean beginConversation(Conversation conversation) { throw new UnsupportedOperationException(); }
@Override public void abandonConversation(Conversation conversation) { throw new UnsupportedOperationException(); }
@Override public void abandonConversation(Conversation conversation, ConversationAbandonedEvent conversationAbandonedEvent) { throw new UnsupportedOperationException(); }
@Override public void sendRawMessage(String s) { throw new UnsupportedOperationException(); }
@Override public PermissionAttachment addAttachment(Plugin plugin, String s, boolean b) { throw new UnsupportedOperationException(); }
@Override public PermissionAttachment addAttachment(Plugin plugin) { throw new UnsupportedOperationException(); }
@Override public PermissionAttachment addAttachment(Plugin plugin, String s, boolean b, int i) { throw new UnsupportedOperationException(); }
@Override public PermissionAttachment addAttachment(Plugin plugin, int i) { throw new UnsupportedOperationException(); }
@Override public void removeAttachment(PermissionAttachment permissionAttachment) { throw new UnsupportedOperationException(); }
@Override public void recalculatePermissions() { throw new UnsupportedOperationException(); }
@Override public Set<PermissionAttachmentInfo> getEffectivePermissions() { throw new UnsupportedOperationException(); }
@Override public void setOp(boolean b) { throw new UnsupportedOperationException(); }
}