mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 06:58:11 +02:00
18f0f8d1ca
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 312281ea PR-742: Make World implement Keyed CraftBukkit Changes: 2ac7fa7a SPIGOT-7014: getLootTable API should not persistently update loot table 7fdd7941 PR-1046: Make World implement Keyed 7bc728a6 PR-1045: Revert changes to persistence required checks Spigot Changes: b6d12d17 Rebuild patches
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
|
|
Date: Fri, 26 Nov 2021 15:09:58 -0800
|
|
Subject: [PATCH] Remove client-side code using deprecated for removal
|
|
AccessController
|
|
|
|
Fixes warnings on build
|
|
|
|
diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
|
|
index d5a4e7d0ba2aff89e9aec64c8545c105926dcab4..e0a77a776533e48a3f8e2165eb77d4765213b79e 100644
|
|
--- a/src/main/java/net/minecraft/Util.java
|
|
+++ b/src/main/java/net/minecraft/Util.java
|
|
@@ -23,7 +23,6 @@ import java.net.URL;
|
|
import java.nio.file.Files;
|
|
import java.nio.file.Path;
|
|
import java.nio.file.spi.FileSystemProvider;
|
|
-import java.security.AccessController;
|
|
import java.security.PrivilegedActionException;
|
|
import java.security.PrivilegedExceptionAction;
|
|
import java.time.Duration;
|
|
@@ -764,21 +763,7 @@ public class Util {
|
|
}
|
|
|
|
public void openUrl(URL url) {
|
|
- try {
|
|
- Process process = AccessController.doPrivileged((PrivilegedExceptionAction<Process>)(() -> {
|
|
- return Runtime.getRuntime().exec(this.getOpenUrlArguments(url));
|
|
- }));
|
|
-
|
|
- for(String string : IOUtils.readLines(process.getErrorStream())) {
|
|
- Util.LOGGER.error(string);
|
|
- }
|
|
-
|
|
- process.getInputStream().close();
|
|
- process.getErrorStream().close();
|
|
- process.getOutputStream().close();
|
|
- } catch (IOException | PrivilegedActionException var5) {
|
|
- Util.LOGGER.error("Couldn't open url '{}'", url, var5);
|
|
- }
|
|
+ throw new IllegalStateException("This method is not useful on dedicated servers."); // Paper
|
|
|
|
}
|
|
|