core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0121-Vehicle-Event-Cancella...

46 lines
2.1 KiB
Diff
Raw Normal View History

Update upstream B/CB/S
2017-05-04 23:08:52 +00:00
From 9e7656b1f8f69832a1bea2e23c6992bbaed9fe97 Mon Sep 17 00:00:00 2001
More involved workaround for vehicle event cancellation
2016-04-22 22:01:28 +00:00
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 22 Apr 2016 18:20:05 -0500
Subject: [PATCH] Vehicle Event Cancellation Changes
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
Update upstream B/CB/S Adds /paper command for reloading the paper config. Closes GH-639 Per-world config logging has been removed in favor of all or nothing logging for all paper settings. I don't believe it was used enough to warrant maintaining. If this is not the case it should be possible to re-add it.
2017-03-25 03:18:58 +00:00
index 8908d8b8d..0f4a1b66b 100644
More involved workaround for vehicle event cancellation
2016-04-22 22:01:28 +00:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
Vehicle Dismount Event Improvements player.getVehicle() was returning null during the event. Paper had added lots of code to cause the player to remount the entity on cancel. I've simplified the diff and made player.getVehicle() work during the event by setting the vehicle back during the event, and only set it to null if the event is not cancelled.
2016-12-29 05:53:02 +00:00
@@ -70,7 +70,7 @@ public abstract class Entity implements ICommandListener {
public boolean i;
public final List<Entity> passengers;
protected int j;
- private Entity au;
+ private Entity au;public void setVehicle(Entity entity) { this.au = entity; } // Paper // OBFHELPER
public boolean attachedToPlayer;
public World world;
public double lastX;
Update upstream B/CB/S Adds /paper command for reloading the paper config. Closes GH-639 Per-world config logging has been removed in favor of all or nothing logging for all paper settings. I don't believe it was used enough to warrant maintaining. If this is not the case it should be possible to re-add it.
2017-03-25 03:18:58 +00:00
@@ -1928,6 +1928,7 @@ public abstract class Entity implements ICommandListener {
Vehicle Dismount Event Improvements player.getVehicle() was returning null during the event. Paper had added lots of code to cause the player to remount the entity on cancel. I've simplified the diff and made player.getVehicle() work during the event by setting the vehicle back during the event, and only set it to null if the event is not cancelled.
2016-12-29 05:53:02 +00:00
throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
More involved workaround for vehicle event cancellation
2016-04-22 22:01:28 +00:00
} else {
// CraftBukkit start
Vehicle Dismount Event Improvements player.getVehicle() was returning null during the event. Paper had added lots of code to cause the player to remount the entity on cancel. I've simplified the diff and made player.getVehicle() work during the event by setting the vehicle back during the event, and only set it to null if the event is not cancelled.
2016-12-29 05:53:02 +00:00
+ entity.setVehicle(this); // Paper - Set the vehicle back for the event
More involved workaround for vehicle event cancellation
2016-04-22 22:01:28 +00:00
CraftEntity craft = (CraftEntity) entity.getBukkitEntity().getVehicle();
Entity orig = craft == null ? null : craft.getHandle();
Vehicle Dismount Event Improvements player.getVehicle() was returning null during the event. Paper had added lots of code to cause the player to remount the entity on cancel. I've simplified the diff and made player.getVehicle() work during the event by setting the vehicle back during the event, and only set it to null if the event is not cancelled.
2016-12-29 05:53:02 +00:00
if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
Update upstream B/CB/S Adds /paper command for reloading the paper config. Closes GH-639 Per-world config logging has been removed in favor of all or nothing logging for all paper settings. I don't believe it was used enough to warrant maintaining. If this is not the case it should be possible to re-add it.
2017-03-25 03:18:58 +00:00
@@ -1943,7 +1944,13 @@ public abstract class Entity implements ICommandListener {
More involved workaround for vehicle event cancellation
2016-04-22 22:01:28 +00:00
}
}
// CraftBukkit end
- Bukkit.getPluginManager().callEvent( new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity())); // Spigot
+ // Paper start - make EntityDismountEvent cancellable
+ if (!new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity()).callEvent()) {
+ return;
+ }
Vehicle Dismount Event Improvements player.getVehicle() was returning null during the event. Paper had added lots of code to cause the player to remount the entity on cancel. I've simplified the diff and made player.getVehicle() work during the event by setting the vehicle back during the event, and only set it to null if the event is not cancelled.
2016-12-29 05:53:02 +00:00
+ entity.setVehicle(null);
More involved workaround for vehicle event cancellation
2016-04-22 22:01:28 +00:00
+ // Paper end
Vehicle Dismount Event Improvements player.getVehicle() was returning null during the event. Paper had added lots of code to cause the player to remount the entity on cancel. I've simplified the diff and made player.getVehicle() work during the event by setting the vehicle back during the event, and only set it to null if the event is not cancelled.
2016-12-29 05:53:02 +00:00
+
More involved workaround for vehicle event cancellation
2016-04-22 22:01:28 +00:00
this.passengers.remove(entity);
entity.j = 60;
}
--
Update upstream B/CB/S
2017-05-04 23:08:52 +00:00
2.12.2
More involved workaround for vehicle event cancellation
2016-04-22 22:01:28 +00:00