mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
d5d756bc32
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@c1b4899 Fix dupe uuid check on entity add (#6735) PaperMC/Paper@3f043f7 Async catch modifications to critical entity state PaperMC/Paper@bc43f40 Update jline and TCA (#6829) PaperMC/Paper@d9e2817 Update paperweight to 1.1.13 (#6866) PaperMC/Paper@3e310e0 Remove redundant and unneeded repos, reorder repos (#6867) PaperMC/Paper@485d15f Update paperweight to 1.1.14 (#6868) PaperMC/Paper@09d50a9 Added missing mappings (#6810) PaperMC/Paper@0968cdd Move async catches back to where they were (#6869) PaperMC/Paper@6f71b7c Deduplicate strings in ObfHelper (#6841) PaperMC/Paper@ada930b Updated Upstream (Bukkit/CraftBukkit) (#6872) PaperMC/Paper@06d82e0 Cache palette array (#6767) PaperMC/Paper@70fe58d Expose the potential player cause of a lightning (#6782) PaperMC/Paper@c20c9d3 Fix CraftNamespacedKey shenanigans (#6825) PaperMC/Paper@29bb5a9 Add PlayerDeathEvent#getPlayer for clarity (#6859) PaperMC/Paper@124d079 Fix issues with mob conversion (#6831) PaperMC/Paper@22b0238 Add API for checking if a zombie has the option to break doors (#6855) PaperMC/Paper@5af80b0 Add isCollidable methods to various places (#6870) PaperMC/Paper@32ba088 Fix setPatternColor on tropical fish bucket meta (#6877) PaperMC/Paper@87121ce Move `getTrackedPlayers` up from Player to Entity (#6569) PaperMC/Paper@a923e33 Make despawn distance configs per-category, improve per category spawn limit config (#6717) PaperMC/Paper@3f17694 Goat ram API (#6336) PaperMC/Paper@cc2ecbc Add Raw Byte Entity Serialization (#6826) Airplane Changes: TECHNOVE/Airplane@e47949b Ty Penple <3 TECHNOVE/Airplane@86fee6b Update upstream
78 lines
4.2 KiB
Diff
78 lines
4.2 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 c94e4cdb5785d5dfcb704c4adabda0b19a20ec7d..0c154e748fe957152777869679bdbdce1524a5a1 100644
|
|
--- a/src/main/java/org/bukkit/permissions/PermissibleBase.java
|
|
+++ b/src/main/java/org/bukkit/permissions/PermissibleBase.java
|
|
@@ -172,7 +172,7 @@ public class PermissibleBase implements Permissible {
|
|
|
|
for (Permission perm : defaults) {
|
|
String name = perm.getName().toLowerCase(java.util.Locale.ENGLISH);
|
|
- 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);
|
|
}
|
|
@@ -200,7 +200,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(java.util.Locale.ENGLISH);
|
|
|
|
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;
|
|
}
|
|
|