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

fix compile

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-09 07:26:34 -04:00
parent 39fae5883d
commit 012e379edb
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19-R0.1-SNAPSHOT
paperCommit = b26d590d0c0830f90ed4e1c5f76ead9de69a242e
paperCommit = e1c2939c11184b2d337d28086a8030104b9e34cb
org.gradle.caching = true
org.gradle.parallel = true

4
patches/server/0001-Rebrand.patch
View File

@@ -192,7 +192,7 @@ index c3ca919ed60f027d6116a85cb79e3b6cd3bf1619..9df1401eb9361df0532b8f5fbfbb46e9
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index afc16bd5a2056d1ee8ce290ec1a6f67c0ac9aedb..6bcd1d35169c7bbe647cd7b829ca2785561750cb 100644
index afc16bd5a2056d1ee8ce290ec1a6f67c0ac9aedb..4fbeee4bede41d96b92c6cdd6503362a2c4dd5fb 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -282,11 +282,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -201,7 +201,7 @@ index afc16bd5a2056d1ee8ce290ec1a6f67c0ac9aedb..6bcd1d35169c7bbe647cd7b829ca2785
// Spigot start
- if (org.spigotmc.SpigotConfig.bungee) {
- DedicatedServer.LOGGER.warn("Whilst this makes it possible to use BungeeCord, unless access to your server is properly restricted, it also opens up the ability for hackers to connect with any username they choose.");
+ if (com.destroystokyo.paper.PaperConfig.isProxyOnlineMode()) { // Purpur
+ if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()) { // Purpur
+ DedicatedServer.LOGGER.warn("Whilst this makes it possible to use BungeeCord or Velocity, unless access to your server is properly restricted, it also opens up the ability for hackers to connect with any username they choose."); // Purpur
DedicatedServer.LOGGER.warn("Please see http://www.spigotmc.org/wiki/firewall-guide/ for further information.");
} else {

6
patches/server/0078-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 317ce5fde32fd4869b41dfabfb5bdc7366f7d517..03faa935d23b53b4749469b0b9b8e8ea2fe83c82 100644
index 36420fffc1085c85741c029c33ea03446bf37e3a..654d0576106ff9bbe30e48100c9039b4724a39d0 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2582,4 +2582,26 @@ public class ServerPlayer extends Player {
@@ -30,13 +30,13 @@ index 317ce5fde32fd4869b41dfabfb5bdc7366f7d517..03faa935d23b53b4749469b0b9b8e8ea
+ if (this.level == toLevel) {
+ this.connection.teleport(to);
+ } else {
+ this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig.disableTeleportationSuffocationCheck);
+ this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck);
+ }
+ }
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 4d7c18796cde467166951374379becc231bbc88c..ab01fd7486d8d068d645a033b5d28f70a313a92c 100644
index 2f0e1869bb7a0ebca2a8c669ecfa48c79550286a..55b12a4cac8a6176f16fe9c95b7696725dd43306 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -44,6 +44,7 @@ import net.minecraft.network.syncher.EntityDataAccessor;

6
patches/server/0124-Implement-TPSBar.patch
View File

@@ -29,7 +29,7 @@ index 862825556b52bb65a003fa633f08ed42cd6ad1fa..90b192ea540c99df4d9ba8713f126cd7
this.hasLoggedStop = true; // Paper
if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index d62a17afdc9dbf75dad91326d2d14d35f0b013b1..f831481434d3bfdb7dba5068ee3fc55f78b98ca0 100644
index 6d0a0186778a115f556bbb376a9c1684f9c5740c..eb17a81e5d45892bf5623160d03197591ddc2ac1 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -347,6 +347,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -41,7 +41,7 @@ index d62a17afdc9dbf75dad91326d2d14d35f0b013b1..f831481434d3bfdb7dba5068ee3fc55f
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index c18c203bdff31e8dc232380f0f917eda2c81c827..590b3c33c43abe52cd560f31047eb86f8691cccb 100644
index 6228ee10d8227d3bc8934dc22d201bdf4fc343fd..749c423c4b2da0520f2fd87530b0e486819fba1e 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -262,6 +262,7 @@ public class ServerPlayer extends Player {
@@ -69,7 +69,7 @@ index c18c203bdff31e8dc232380f0f917eda2c81c827..590b3c33c43abe52cd560f31047eb86f
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2612,5 +2615,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig.disableTeleportationSuffocationCheck);
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck);
}
}
+