Skip to content
This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

Commit

Permalink
Merge branch 'ver/1.19.2' of https://github.com/PrismarineTeam/Prisma…
Browse files Browse the repository at this point in the history
…rine into dev/rewrite-chunk-system
  • Loading branch information
AlphaKR93 committed Aug 18, 2022
2 parents 8dd3cd6 + 910917f commit 7f795ac
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
group = net.prismarineteam.prismarine
version = 1.19.2-R0.1-SNAPSHOT

paperCommit = 4ba43fe02a01abbbccac73f6ff992b6c667accb0
paperCommit = 2da891fcfacf585956781cb0f5694605d75dba60

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
8 changes: 4 additions & 4 deletions patches/server/0013-Do-not-send-useless-entity-packets.patch
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,10 @@ index 22acc4d451a96c4b7655a9f2333a283d2b891caa..e69cfe03e35b2e8eae0f82084a5d7cc1
}

if ((this.trackDelta || this.entity.hasImpulse || this.entity instanceof LivingEntity && ((LivingEntity) this.entity).isFallFlying()) && this.tickCount > 0) {
@@ -246,6 +247,22 @@ public class ServerEntity {
}
@@ -247,6 +248,22 @@ public class ServerEntity {

}
+

+ // Prismarine start
+ private boolean isUselessEntityPacket(Packet<?> possibleUselessEntityPacket) {
+ if (possibleUselessEntityPacket instanceof ClientboundMoveEntityPacket) {
Expand All @@ -59,9 +58,10 @@ index 22acc4d451a96c4b7655a9f2333a283d2b891caa..e69cfe03e35b2e8eae0f82084a5d7cc1
+ return false;
+ }
+ // Prismarine end
+
public void removePairing(ServerPlayer player) {
this.entity.stopSeenByPlayer(player);
// Pufferfish start - ensure main thread
diff --git a/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java b/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java
index 7ff0d6ca8fcd4c9c5692647fe602512cb31ad65b..c1630079740f4ff37d772fa31859efa26af1c61e 100644
--- a/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java
Expand Down
2 changes: 1 addition & 1 deletion upstream-data
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
purpur = ac5c303a0dae61581ed23f217187b6b8b82d770c
purpur = 16990c4edf85a7e68e4563d06e20c9db895baf37
pufferfish = 254c00275d81d8b94956f1729c8bbdc8319244f3

0 comments on commit 7f795ac

Please sign in to comment.