Repo-Mirror/MiraiMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update Upstream (Pufferfish)

Browse Source
This commit is contained in:
etil2jz
2022-02-19 13:54:03 +01:00
parent 126c5317dd
commit 7c2f3037e7
33 changed files with 137 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0064-Packet-obfuscation-and-reduction.patch
View File

@@ -133,7 +133,7 @@ index 2e2bfccfc6cec6582a5b595e0343c27be5267b7a..e97d4081e37b82019dbc90ae6c53b868
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
index 2d0c8d6f8677e289befde5ada4ae702eed73754d..fca77df27456c0dea9ed8bc15884ac6211508504 100644
index 0fed167448b0b4af0a6898c3880641a475acbce3..46f07e9eae81a66747970f8b5c58711e22a41e97 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -389,7 +389,19 @@ public class ServerEntity {
@@ -158,7 +158,7 @@ index 2d0c8d6f8677e289befde5ada4ae702eed73754d..fca77df27456c0dea9ed8bc15884ac62
if (this.entity instanceof LivingEntity) {
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index f008fb003e9a18d6ed0dd08cc6c99b14e8363bb8..97ff4c0b6b1a12c6de82bc8d707337792d1c99b2 100644
index 7347e7a529cb642416b76b007948a8edec60539d..a8b370b48c04912c4c16795d7d19a4e9c63c7da4 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3001,7 +3001,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -184,10 +184,10 @@ index d85da02be7f1d494af8f2cc840c49073774f5f9c..aaf3a82c57b92b53d6bd737a4e20c91b
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 60dbed75f29777f8ffcd1349549be75729d48be1..3820a4c379a2c006d0cb179c931fc4da12b2adda 100644
index f6893b0ef990d76fed9e634a2c946e1b4281d482..54314513221785368ceb6b7a1d499dd4baf108c0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2096,7 +2096,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2119,7 +2119,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.sendHealthUpdate();
}
}