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

46 lines
2.1 KiB
Diff
Raw Normal View History

Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 03:57:31 +00:00
From e834b8fc7de6fc3a3460176d2c23e77d3c5afce3 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
Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 03:57:31 +00:00
index 89e42c0a46..86b783e73b 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
Guard the Entity.SHARED_RANDOM from seed changes I don't clearly see any, but as a protection for future changes.
2018-07-21 13:03:10 +00:00
@@ -83,7 +83,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper
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
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;
Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 03:57:31 +00:00
@@ -2022,6 +2022,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper
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) {
Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 03:57:31 +00:00
@@ -2037,7 +2038,13 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper
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;
}
--
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 07:55:24 +00:00
2.18.0
More involved workaround for vehicle event cancellation
2016-04-22 22:01:28 +00:00