mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8347)

Browse source
This commit is contained in:
Jake Potrebic 2022-09-09 11:54:00 -07:00 • committed by GitHub
parent 36a5f150c5
commit e51401e764
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 150 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

6
patches/server/0148-Basic-PlayerProfile-API.patch
View file

@ -555,7 +555,7 @@ index 0000000000000000000000000000000000000000..7ac27392a8647ef7d0dc78efe78703e9
+ @NotNull GameProfile buildGameProfile();
+}
diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
index 3023bf9d1e7ead3afedc7f72a85ee65f6cf2016c..98cd851cdc67ecd9296ec5a8e56141638e108109 100644
index 5eb6ce20ee17d87db0f6c2dcee96d6d0891d6c50..3e8867c317f7018780f44b62d0bd40fc9fa9ce9f 100644
--- a/src/main/java/net/minecraft/server/MCUtil.java
+++ b/src/main/java/net/minecraft/server/MCUtil.java
@@ -1,5 +1,7 @@
@ -586,10 +586,10 @@ index 3023bf9d1e7ead3afedc7f72a85ee65f6cf2016c..98cd851cdc67ecd9296ec5a8e5614163
* Calculates distance between 2 entities
* @param e1
diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
index 0c59ca1a22449893adcfa851198f057ce69bb7e3..8fda43173012ed3134ed1f114143ceaad66cae4a 100644
index 45db9f1b1d19319e7f92bd4e61be9ea9b06dd5e5..151b13e257c09fc5c4bbccfc388b15ad76133909 100644
--- a/src/main/java/net/minecraft/server/Main.java
+++ b/src/main/java/net/minecraft/server/Main.java
@@ -138,7 +138,7 @@ public class Main {
@@ -155,7 +155,7 @@ public class Main {
}
File file = (File) optionset.valueOf("universe"); // CraftBukkit