Skip to content

Commit 70f4f3a

Browse files
committed
Add missing teleport logic from ServerPlayer#teleport
We need to: 1. Unconditionally invoke stopUsingItem() 2. Update last sent exp/health/food to -1 to cause an update to occur in the next tick.
1 parent fc6aa20 commit 70f4f3a

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

folia-server/minecraft-patches/features/0001-Region-Threading-Base.patch

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11951,7 +11951,7 @@ index bfbfbaa9660d21071c420b60b10be0a02a1bc87e..dab8cfad3435dd19f93646a99b41f481
1195111951
// Paper end - lag compensation
1195211952
}
1195311953
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
11954-
index 3781d9cc174b7aecacb9b9855d52c7b1ff05835c..e4597921598c48443be1b5610960c7bcbe8a8844 100644
11954+
index 3781d9cc174b7aecacb9b9855d52c7b1ff05835c..fae95f318d7ec66d2d6f8befd4a03b3ea57fc9e3 100644
1195511955
--- a/net/minecraft/server/level/ServerPlayer.java
1195611956
+++ b/net/minecraft/server/level/ServerPlayer.java
1195711957
@@ -188,7 +188,7 @@ import org.slf4j.Logger;
@@ -12172,7 +12172,7 @@ index 3781d9cc174b7aecacb9b9855d52c7b1ff05835c..e4597921598c48443be1b5610960c7bc
1217212172
} else {
1217312173
this.setCamera(this);
1217412174
}
12175-
@@ -1306,9 +1472,323 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
12175+
@@ -1306,9 +1472,322 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
1217612176
}
1217712177
}
1217812178

@@ -12428,6 +12428,7 @@ index 3781d9cc174b7aecacb9b9855d52c7b1ff05835c..e4597921598c48443be1b5610960c7bc
1242812428
+ java.util.Collections.emptySet()
1242912429
+ );
1243012430
+ this.connection.resetPosition();
12431+
+ this.stopUsingItem();
1243112432
+
1243212433
+ // delay callback until after post add logic
1243312434
+
@@ -12441,11 +12442,9 @@ index 3781d9cc174b7aecacb9b9855d52c7b1ff05835c..e4597921598c48443be1b5610960c7bc
1244112442
+ this.connection.send(new ClientboundUpdateMobEffectPacket(this.getId(), mobEffect, false));
1244212443
+ }*/ // handled by sendActivePlayerEffects
1244312444
+
12444-
+ // Paper start - Reset shield blocking on dimension change
12445-
+ if (this.isBlocking()) {
12446-
+ this.stopUsingItem();
12447-
+ }
12448-
+ // Paper end - Reset shield blocking on dimension change
12445+
+ this.lastSentExp = -1;
12446+
+ this.lastSentHealth = -1.0F;
12447+
+ this.lastSentFood = -1;
1244912448
+
1245012449
+ this.triggerDimensionChangeTriggers(originWorld);
1245112450
+
@@ -12496,7 +12495,7 @@ index 3781d9cc174b7aecacb9b9855d52c7b1ff05835c..e4597921598c48443be1b5610960c7bc
1249612495
if (this.isSleeping()) return null; // CraftBukkit - SPIGOT-3154
1249712496
if (this.isRemoved()) {
1249812497
return null;
12499-
@@ -2322,7 +2802,30 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
12498+
@@ -2322,7 +2801,30 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
1250012499
return (Entity)(this.camera == null ? this : this.camera);
1250112500
}
1250212501

@@ -12527,7 +12526,7 @@ index 3781d9cc174b7aecacb9b9855d52c7b1ff05835c..e4597921598c48443be1b5610960c7bc
1252712526
Entity camera = this.getCamera();
1252812527
this.camera = (Entity)(entityToSpectate == null ? this : entityToSpectate);
1252912528
if (camera != this.camera) {
12530-
@@ -2341,16 +2844,19 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
12529+
@@ -2341,16 +2843,19 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
1253112530
}
1253212531
}
1253312532
// Paper end - Add PlayerStartSpectatingEntityEvent and PlayerStopSpectatingEntity
@@ -12554,7 +12553,7 @@ index 3781d9cc174b7aecacb9b9855d52c7b1ff05835c..e4597921598c48443be1b5610960c7bc
1255412553
}
1255512554
}
1255612555

12557-
@@ -2728,11 +3234,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
12556+
@@ -2728,11 +3233,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
1255812557
}
1255912558

1256012559
public void registerEnderPearl(ThrownEnderpearl enderPearl) {
@@ -12568,7 +12567,7 @@ index 3781d9cc174b7aecacb9b9855d52c7b1ff05835c..e4597921598c48443be1b5610960c7bc
1256812567
}
1256912568

1257012569
public Set<ThrownEnderpearl> getEnderPearls() {
12571-
@@ -2902,7 +3408,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
12570+
@@ -2902,7 +3407,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
1257212571
this.experienceLevel = this.newLevel;
1257312572
this.totalExperience = this.newTotalExp;
1257412573
this.experienceProgress = 0;

0 commit comments

Comments
 (0)