From 8fddabe00f0c7d3c112c5285c2f665ae3779dcfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elias=20M=C3=BCller?= <elias@elias-mueller.com>
Date: Sun, 1 Oct 2023 18:11:32 +0200
Subject: [PATCH] Added command refresh after persmission change
---
.gitignore | 2 +-
.../compileJava/previous-compilation-data.bin | Bin 63510 -> 63510 bytes
.../command/privileged/OpCommand.java | 6 +++---
.../AddEntityToInstanceEventListener.java | 3 ---
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore
index cbdefd6..a5cb846 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,4 +28,4 @@ replay_pid*
.idea
.gradle
-build
\ No newline at end of file
+build/*
\ No newline at end of file
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
index c04b40a4c088aaf301184b57828b1264818d46a4..9a7d97f557c5328e1102a4476f34c999713c03a5 100644
GIT binary patch
delta 31
ncmbRCfqB{o<_+IC1h`Y=>STYlxYS4cJ^X(AzR6}bPJ#CT=3owL
delta 31
pcmV+)0O0?Y@B^0c1F-f85ZNI3!QqcmT_DOjT<I;#=(7e15bp!N53B$H
diff --git a/src/main/java/eu/mhsl/minenet/minigames/command/privileged/OpCommand.java b/src/main/java/eu/mhsl/minenet/minigames/command/privileged/OpCommand.java
index 3a307f9..5fe9e73 100644
--- a/src/main/java/eu/mhsl/minenet/minigames/command/privileged/OpCommand.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/command/privileged/OpCommand.java
@@ -16,10 +16,10 @@ public class OpCommand extends Command {
addSyntax((sender, context) -> {
Player target = MinecraftServer.getConnectionManager().getPlayer(context.getRaw("target"));
- if(target != null)
+ if(target != null) {
target.addPermission(new Permission("admin"));
- else
- new ChatMessage(Icon.ERROR).appendStatic("Spieler nicht gefunden").send(sender);
+ target.refreshCommands();
+ } else new ChatMessage(Icon.ERROR).appendStatic("Spieler nicht gefunden").send(sender);
}, ArgumentType.Entity("target").onlyPlayers(true));
}
}
diff --git a/src/main/java/eu/mhsl/minenet/minigames/handler/global/AddEntityToInstanceEventListener.java b/src/main/java/eu/mhsl/minenet/minigames/handler/global/AddEntityToInstanceEventListener.java
index 0aed0ba..d5b7058 100644
--- a/src/main/java/eu/mhsl/minenet/minigames/handler/global/AddEntityToInstanceEventListener.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/handler/global/AddEntityToInstanceEventListener.java
@@ -23,10 +23,7 @@ public class AddEntityToInstanceEventListener implements EventListener<AddEntity
@Override
public @NotNull Result run(@NotNull AddEntityToInstanceEvent event) {
if(event.getEntity() instanceof Player p) {
-
MinecraftServer.getSchedulerManager().scheduleNextTick(p::refreshCommands, ExecutionType.ASYNC);
- new ActionBarMessage().appendStatic(Component.text("Instance: ", NamedTextColor.DARK_GRAY)).appendStatic(event.getInstance().getUniqueId().toString()).send(p);
- new ChatMessage(Icon.SCIENCE).appendStatic(Component.text(event.getInstance().getUniqueId().toString())).send(p);
p.addEffect(new Potion(PotionEffect.BLINDNESS, (byte) 1, 20)); //TODO Uncomment, currently buggy causes disconnect see https://github.com/Minestom/Minestom/discussions/1302
}