Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 11:06:29 +01:00
Code Issues Projects Releases Wiki Activity

Fix handling of changes to PlayerVelocityEvent.velocity by event callers.

Browse Source
This commit is contained in:
Antony Riley 2015-07-20 22:42:30 +03:00
parent 3e9b5c93d6
commit 83cb83dcd4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nms-patches/EntityHuman.patch
View File

@ -315,7 +315,7 @@
+ if (event.isCancelled()) {
+ cancelled = true;
+ } else if (!velocity.equals(event.getVelocity())) {
+ player.setVelocity(velocity);
+ player.setVelocity(event.getVelocity());
+ }
+
+ if (!cancelled) {

4
nms-patches/EntityTrackerEntry.patch
View File

@ -89,13 +89,13 @@
+ Player player = (Player) this.tracker.getBukkitEntity();
+ org.bukkit.util.Vector velocity = player.getVelocity();
+
+ PlayerVelocityEvent event = new PlayerVelocityEvent(player, velocity);
+ PlayerVelocityEvent event = new PlayerVelocityEvent(player, velocity.clone());
+ this.tracker.world.getServer().getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) {
+ cancelled = true;
+ } else if (!velocity.equals(event.getVelocity())) {
+ player.setVelocity(velocity);
+ player.setVelocity(event.getVelocity());
+ }
+ }
+