mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
201e928fa6
Upstream has released updates that appear to apply and compile correctly Pufferfish Changes: pufferfish-gg/Pufferfish@c9f4e20 Final 1.20.4 Update pufferfish-gg/Pufferfish@1f3ad02 Final 1.20.4 update, for realzies pufferfish-gg/Pufferfish@b1ab664 Enable SIMD on java 21 pufferfish-gg/Pufferfish@0674c2b 1.21 compiles pufferfish-gg/Pufferfish@98ea973 Fix 1.21 version checkers pufferfish-gg/Pufferfish@68f859c Fix lambda/tick guard patch pufferfish-gg/Pufferfish@eaa18d5 Updated Upstream (Paper) pufferfish-gg/Pufferfish@1d72eea Updated Upstream (Paper) pufferfish-gg/Pufferfish@1d3c743 Update pufferfish version detector stuff pufferfish-gg/Pufferfish@5e30963 Fix crash bug pufferfish-gg/Pufferfish@12571eb Use mojmapped paperclip jar instead (CI only) pufferfish-gg/Pufferfish@4d16ae0 Drop a patch - moonrise includes it pufferfish-gg/Pufferfish@52c2d05 Revert "Drop a patch - moonrise includes it" pufferfish-gg/Pufferfish@bdb56f1 Fix entity interactions with fluids pufferfish-gg/Pufferfish@469e5c1 Updated Upstream (Paper) pufferfish-gg/Pufferfish@d75961f 1.21.1 Update (Updated Upstream (Paper))
78 lines
4.1 KiB
Diff
78 lines
4.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Wed, 30 Jun 2021 17:44:27 -0500
|
|
Subject: [PATCH] Fix default permission system
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/permissions/PermissibleBase.java b/src/main/java/org/bukkit/permissions/PermissibleBase.java
|
|
index 75b77cc4fe189b4b6baa1af3663dc492e992a266..30b98d1645c571ba5c18e5cc93b0bec3f74b1d3b 100644
|
|
--- a/src/main/java/org/bukkit/permissions/PermissibleBase.java
|
|
+++ b/src/main/java/org/bukkit/permissions/PermissibleBase.java
|
|
@@ -169,7 +169,7 @@ public class PermissibleBase implements Permissible {
|
|
|
|
for (Permission perm : defaults) {
|
|
String name = perm.getName().toLowerCase(Locale.ROOT);
|
|
- permissions.put(name, new PermissionAttachmentInfo(parent, name, null, true));
|
|
+ permissions.put(name, new PermissionAttachmentInfo(parent, name, null, perm.getDefault().getValue(isOp()))); // Purpur
|
|
Bukkit.getServer().getPluginManager().subscribeToPermission(name, parent);
|
|
calculateChildPermissions(perm.getChildren(), false, null);
|
|
}
|
|
@@ -197,7 +197,7 @@ public class PermissibleBase implements Permissible {
|
|
String name = entry.getKey();
|
|
|
|
Permission perm = Bukkit.getServer().getPluginManager().getPermission(name);
|
|
- boolean value = entry.getValue() ^ invert;
|
|
+ boolean value = (entry.getValue() == null && perm != null ? perm.getDefault().getValue(isOp()) : entry.getValue()) ^ invert; // Purpur
|
|
String lname = name.toLowerCase(Locale.ROOT);
|
|
|
|
permissions.put(lname, new PermissionAttachmentInfo(parent, lname, attachment, value));
|
|
diff --git a/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java b/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java
|
|
index 8e481e3815f5645ee92f0d229e5ff25c8fc9a6c2..10627d2a11251a8cb01bbc3f6242d66f3505a16e 100644
|
|
--- a/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java
|
|
+++ b/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java
|
|
@@ -31,7 +31,7 @@ public final class DefaultPermissions {
|
|
|
|
if (withLegacy) {
|
|
Permission legacy = new Permission(LEGACY_PREFIX + result.getName(), result.getDescription(), PermissionDefault.FALSE);
|
|
- legacy.getChildren().put(result.getName(), true);
|
|
+ legacy.getChildren().put(result.getName(), null); // Purpur
|
|
registerPermission(perm, false);
|
|
}
|
|
|
|
@@ -40,7 +40,7 @@ public final class DefaultPermissions {
|
|
|
|
@NotNull
|
|
public static Permission registerPermission(@NotNull Permission perm, @NotNull Permission parent) {
|
|
- parent.getChildren().put(perm.getName(), true);
|
|
+ parent.getChildren().put(perm.getName(), null); // Purpur
|
|
return registerPermission(perm);
|
|
}
|
|
|
|
@@ -53,7 +53,7 @@ public final class DefaultPermissions {
|
|
@NotNull
|
|
public static Permission registerPermission(@NotNull String name, @Nullable String desc, @NotNull Permission parent) {
|
|
Permission perm = registerPermission(name, desc);
|
|
- parent.getChildren().put(perm.getName(), true);
|
|
+ parent.getChildren().put(perm.getName(), null); // Purpur
|
|
return perm;
|
|
}
|
|
|
|
@@ -66,7 +66,7 @@ public final class DefaultPermissions {
|
|
@NotNull
|
|
public static Permission registerPermission(@NotNull String name, @Nullable String desc, @Nullable PermissionDefault def, @NotNull Permission parent) {
|
|
Permission perm = registerPermission(name, desc, def);
|
|
- parent.getChildren().put(perm.getName(), true);
|
|
+ parent.getChildren().put(perm.getName(), null); // Purpur
|
|
return perm;
|
|
}
|
|
|
|
@@ -79,7 +79,7 @@ public final class DefaultPermissions {
|
|
@NotNull
|
|
public static Permission registerPermission(@NotNull String name, @Nullable String desc, @Nullable PermissionDefault def, @Nullable Map<String, Boolean> children, @NotNull Permission parent) {
|
|
Permission perm = registerPermission(name, desc, def, children);
|
|
- parent.getChildren().put(perm.getName(), true);
|
|
+ parent.getChildren().put(perm.getName(), null); // Purpur
|
|
return perm;
|
|
}
|
|
|