mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 02:17:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@1cda66e Hotfix Entity isInRain reobf issue PaperMC/Paper@61768e0 [ci skip] Remove no longer needed mappings change PaperMC/Paper@e035fd7 Updated Upstream (Bukkit/CraftBukkit/Spigot) PaperMC/Paper@c215ce1 [ci skip] cleanup patch diff from last commit
This commit is contained in:
@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur client support
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
index d1f20a8a3ccea1f074624163eb96da023142a459..f45cd36ddc96d19f11bde4db1094d92ae4b13786 100644
|
||||
index 0eb3384df396508c3d26d1e155cd0e6d64251346..393edc13408ed8b3aad36121891eddf75ea321ff 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -281,6 +281,7 @@ public class ServerPlayer extends Player {
|
||||
@@ -43,10 +43,10 @@ index d28d0ef6105ddeb562ddf31ae9088739856941fc..49aaa5147b9b904fa912c1811dc66d47
|
||||
try {
|
||||
String channels = payload.toString(com.google.common.base.Charsets.UTF_8);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index fa5024752652b6daf53dbb9e23a9e86fea203fe2..729cdd9cf47fe8c46df9270202cc6a0d78b61052 100644
|
||||
index c54df6e4aed9b7b46a41af4108a8e90d96c1fe1f..3bf86f27beada77d0abf6b91a8fc51e19cc3d787 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -3327,4 +3327,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -3326,4 +3326,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
return this.spigot;
|
||||
}
|
||||
// Spigot end
|
||||
|
||||
Reference in New Issue
Block a user