Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add permission to bypass portal wait time

Browse Source 
resolves #416
This commit is contained in:
William Blake Galbreath
2021-06-26 23:08:27 -05:00
parent 2e3e2c5216
commit 0f0cf76f3a
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/api/0003-Default-permissions.patch
View File

@@ -31,10 +31,10 @@ index e1a4ddf2c07cdd242fa8054a0152522fe4039e85..8e481e3815f5645ee92f0d229e5ff25c
} }
diff --git a/src/main/java/org/bukkit/util/permissions/PurpurPermissions.java b/src/main/java/org/bukkit/util/permissions/PurpurPermissions.java diff --git a/src/main/java/org/bukkit/util/permissions/PurpurPermissions.java b/src/main/java/org/bukkit/util/permissions/PurpurPermissions.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..719980ee82bea8ac4c5e48c4ccee33c4cd413bc3 index 0000000000000000000000000000000000000000..505413694c1310dc513961247a9c310f2cadafde
--- /dev/null --- /dev/null
+++ b/src/main/java/org/bukkit/util/permissions/PurpurPermissions.java +++ b/src/main/java/org/bukkit/util/permissions/PurpurPermissions.java
@@ -0,0 +1,77 @@ @@ -0,0 +1,79 @@
+package org.bukkit.util.permissions; +package org.bukkit.util.permissions;
+ +
+import org.bukkit.entity.Entity; +import org.bukkit.entity.Entity;
@@ -108,6 +108,8 @@ index 0000000000000000000000000000000000000000..719980ee82bea8ac4c5e48c4ccee33c4
+ DefaultPermissions.registerPermission("allow.powered.creeper", "Allows the user to toggle creeper powered state", PermissionDefault.FALSE, powered); + DefaultPermissions.registerPermission("allow.powered.creeper", "Allows the user to toggle creeper powered state", PermissionDefault.FALSE, powered);
+ powered.recalculatePermissibles(); + powered.recalculatePermissibles();
+ +
+ DefaultPermissions.registerPermission(PREFIX + "portal.instant", "Allows the user to bypass portal wait time", PermissionDefault.FALSE, purpur);
+
+ purpur.recalculatePermissibles(); + purpur.recalculatePermissibles();
+ return purpur; + return purpur;
+ } + }

19
patches/server/0216-Add-permission-bypass-for-portal-waiting.patch Normal file
View File

@@ -0,0 +1,19 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 26 Jun 2021 23:05:12 -0500
Subject: [PATCH] Add permission bypass for portal waiting
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 34e6be36d1304e072bd742a61105757f8e6b0a62..810e02b890f053a75b6cdc9afb1f3d9acd5e6736 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -465,7 +465,7 @@ public abstract class Player extends LivingEntity {
@Override
public int getPortalWaitTime() {
- return this.abilities.invulnerable ? 1 : 80;
+ return this.abilities.invulnerable || getBukkitEntity().hasPermission("purpur.portal.instant") ? 1 : 80; // Purpur
}
@Override