SteamWar/Paper-Old
Archiviert
13
0
Fork 0
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

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

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Antony Riley 2015-07-20 22:42:30 +03:00
Ursprung 3e9b5c93d6
Commit 83cb83dcd4
2 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
nms-patches/EntityHuman.patch
Datei anzeigen

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

4
nms-patches/EntityTrackerEntry.patch
Datei anzeigen

@ -89,13 +89,13 @@
+ Player player = (Player) this.tracker.getBukkitEntity(); + Player player = (Player) this.tracker.getBukkitEntity();
+ org.bukkit.util.Vector velocity = player.getVelocity(); + 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); + this.tracker.world.getServer().getPluginManager().callEvent(event);
+ +
+ if (event.isCancelled()) { + if (event.isCancelled()) {
+ cancelled = true; + cancelled = true;
+ } else if (!velocity.equals(event.getVelocity())) { + } else if (!velocity.equals(event.getVelocity())) {
+ player.setVelocity(velocity); + player.setVelocity(event.getVelocity());
+ } + }
+ } + }
+ +