diff options
| author | Antony Riley <antony@cyberiantiger.org> | 2015-07-20 22:42:30 +0300 |
|---|---|---|
| committer | Antony Riley <antony@cyberiantiger.org> | 2015-07-20 22:45:21 +0300 |
| commit | 83cb83dcd4ce69169a38d444d260c7d748a0c2ea (patch) | |
| tree | 122c3e4a8f1c1948fa9b88a7c25e0620472c68eb /nms-patches | |
| parent | 3e9b5c93d651202731542b45e02eafa23f5dbe57 (diff) | |
| download | craftbukkit-83cb83dcd4ce69169a38d444d260c7d748a0c2ea.tar craftbukkit-83cb83dcd4ce69169a38d444d260c7d748a0c2ea.tar.gz craftbukkit-83cb83dcd4ce69169a38d444d260c7d748a0c2ea.tar.lz craftbukkit-83cb83dcd4ce69169a38d444d260c7d748a0c2ea.tar.xz craftbukkit-83cb83dcd4ce69169a38d444d260c7d748a0c2ea.zip | |
Fix handling of changes to PlayerVelocityEvent.velocity by event callers.
Diffstat (limited to 'nms-patches')
| -rw-r--r-- | nms-patches/EntityHuman.patch | 2 | ||||
| -rw-r--r-- | nms-patches/EntityTrackerEntry.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/EntityHuman.patch b/nms-patches/EntityHuman.patch index 290b6434..fad88539 100644 --- a/nms-patches/EntityHuman.patch +++ b/nms-patches/EntityHuman.patch @@ -315,7 +315,7 @@ + if (event.isCancelled()) { + cancelled = true; + } else if (!velocity.equals(event.getVelocity())) { -+ player.setVelocity(velocity); ++ player.setVelocity(event.getVelocity()); + } + + if (!cancelled) { diff --git a/nms-patches/EntityTrackerEntry.patch b/nms-patches/EntityTrackerEntry.patch index dda3d643..0a6cc779 100644 --- a/nms-patches/EntityTrackerEntry.patch +++ b/nms-patches/EntityTrackerEntry.patch @@ -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()); + } + } + |