Fix friction being applied to velocity changes

Also fix NoSuchMethodError in LegacyFlagBeam Signed-off-by: cswhite2000 <[email protected]>
PGMDev · Apr 29, 2021 · e361596 · e361596
1 parent 13da9b5
commit e361596
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/core/src/main/java/tc/oc/pgm/flag/LegacyFlagBeamMatchModule.java b/core/src/main/java/tc/oc/pgm/flag/LegacyFlagBeamMatchModule.java
@@ -98,7 +98,7 @@ public void onPlayerChangedWorld(PlayerChangedWorldEvent event) {
     MatchPlayer player = match.getPlayer(event.getPlayer());
     if (player == null) return;
 
-    if (event.getWorld() == match.getWorld()) showLater(player);
+    if (event.getPlayer().getWorld() == match.getWorld()) showLater(player);
     else beams().forEach(beam -> beam.hide(player));
   }
 

diff --git a/util/src/main/java/tc/oc/pgm/util/nms/NMSHacks.java b/util/src/main/java/tc/oc/pgm/util/nms/NMSHacks.java
@@ -868,6 +868,7 @@ static Skin getPlayerSkin(Player player) {
 
   static void updateVelocity(Player player) {
     EntityPlayer handle = ((CraftPlayer) player).getHandle();
+    handle.velocityChanged = false;
     handle.playerConnection.sendPacket(new PacketPlayOutEntityVelocity(handle));
   }