2021-03-15 23:00:00 +01:00
|
|
|
--- a/net/minecraft/world/entity/projectile/EntityEnderPearl.java
|
|
|
|
+++ b/net/minecraft/world/entity/projectile/EntityEnderPearl.java
|
2024-02-21 10:55:34 +01:00
|
|
|
@@ -18,6 +18,14 @@
|
2021-03-15 23:00:00 +01:00
|
|
|
import net.minecraft.world.phys.MovingObjectPosition;
|
|
|
|
import net.minecraft.world.phys.MovingObjectPositionEntity;
|
2021-03-08 22:47:33 +01:00
|
|
|
|
2014-11-25 22:32:16 +01:00
|
|
|
+// CraftBukkit start
|
|
|
|
+import org.bukkit.Bukkit;
|
|
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
2016-07-01 04:30:28 +02:00
|
|
|
+import org.bukkit.event.entity.CreatureSpawnEvent;
|
2024-02-21 10:55:34 +01:00
|
|
|
+import org.bukkit.event.entity.EntityRemoveEvent;
|
2014-11-25 22:32:16 +01:00
|
|
|
+import org.bukkit.event.player.PlayerTeleportEvent;
|
|
|
|
+// CraftBukkit end
|
2021-03-08 22:47:33 +01:00
|
|
|
+
|
2019-04-23 04:00:00 +02:00
|
|
|
public class EntityEnderPearl extends EntityProjectileThrowable {
|
2014-11-25 22:32:16 +01:00
|
|
|
|
2021-03-08 22:47:33 +01:00
|
|
|
public EntityEnderPearl(EntityTypes<? extends EntityEnderPearl> entitytypes, World world) {
|
2024-02-21 10:55:34 +01:00
|
|
|
@@ -54,23 +62,34 @@
|
2020-06-25 02:00:00 +02:00
|
|
|
EntityPlayer entityplayer = (EntityPlayer) entity;
|
2015-02-26 23:41:06 +01:00
|
|
|
|
2023-06-07 17:30:00 +02:00
|
|
|
if (entityplayer.connection.isAcceptingMessages() && entityplayer.level() == this.level() && !entityplayer.isSleeping()) {
|
|
|
|
- if (this.random.nextFloat() < 0.05F && this.level().getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING)) {
|
|
|
|
- EntityEndermite entityendermite = (EntityEndermite) EntityTypes.ENDERMITE.create(this.level());
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit start - Fire PlayerTeleportEvent
|
|
|
|
+ org.bukkit.craftbukkit.entity.CraftPlayer player = entityplayer.getBukkitEntity();
|
|
|
|
+ org.bukkit.Location location = getBukkitEntity().getLocation();
|
|
|
|
+ location.setPitch(player.getLocation().getPitch());
|
|
|
|
+ location.setYaw(player.getLocation().getYaw());
|
2023-09-21 18:57:13 +02:00
|
|
|
|
|
|
|
- if (entityendermite != null) {
|
|
|
|
- entityendermite.moveTo(entity.getX(), entity.getY(), entity.getZ(), entity.getYRot(), entity.getXRot());
|
|
|
|
- this.level().addFreshEntity(entityendermite);
|
2014-11-25 22:32:16 +01:00
|
|
|
+ PlayerTeleportEvent teleEvent = new PlayerTeleportEvent(player, player.getLocation(), location, PlayerTeleportEvent.TeleportCause.ENDER_PEARL);
|
|
|
|
+ Bukkit.getPluginManager().callEvent(teleEvent);
|
|
|
|
+
|
2023-03-14 18:14:08 +01:00
|
|
|
+ if (!teleEvent.isCancelled() && entityplayer.connection.isAcceptingMessages()) {
|
2023-06-07 17:30:00 +02:00
|
|
|
+ if (this.random.nextFloat() < 0.05F && this.level().getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING)) {
|
|
|
|
+ EntityEndermite entityendermite = (EntityEndermite) EntityTypes.ENDERMITE.create(this.level());
|
2021-06-11 07:00:00 +02:00
|
|
|
+
|
2022-12-07 17:00:00 +01:00
|
|
|
+ if (entityendermite != null) {
|
|
|
|
+ entityendermite.moveTo(entity.getX(), entity.getY(), entity.getZ(), entity.getYRot(), entity.getXRot());
|
2023-06-07 17:30:00 +02:00
|
|
|
+ this.level().addFreshEntity(entityendermite, CreatureSpawnEvent.SpawnReason.ENDER_PEARL);
|
2022-12-07 17:00:00 +01:00
|
|
|
+ }
|
|
|
|
}
|
|
|
|
- }
|
|
|
|
|
|
|
|
- if (entity.isPassenger()) {
|
|
|
|
- entityplayer.dismountTo(this.getX(), this.getY(), this.getZ());
|
|
|
|
- } else {
|
|
|
|
- entity.teleportTo(this.getX(), this.getY(), this.getZ());
|
2023-09-21 18:57:13 +02:00
|
|
|
- }
|
|
|
|
+ if (entity.isPassenger()) {
|
|
|
|
+ entity.stopRiding();
|
|
|
|
+ }
|
|
|
|
|
|
|
|
- entity.resetFallDistance();
|
|
|
|
- entity.hurt(this.damageSources().fall(), 5.0F);
|
2021-06-11 07:00:00 +02:00
|
|
|
+ entityplayer.connection.teleport(teleEvent.getTo());
|
2021-11-21 23:00:00 +01:00
|
|
|
+ entity.resetFallDistance();
|
2024-02-10 23:54:25 +01:00
|
|
|
+ entity.hurt(this.damageSources().fall().customCausingEntity(this), 5.0F); // CraftBukkit
|
2023-09-21 18:57:13 +02:00
|
|
|
+ }
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit end
|
2023-12-05 17:40:00 +01:00
|
|
|
this.level().playSound((EntityHuman) null, this.getX(), this.getY(), this.getZ(), SoundEffects.PLAYER_TELEPORT, SoundCategory.PLAYERS);
|
2016-03-02 17:48:00 +01:00
|
|
|
}
|
2020-06-25 02:00:00 +02:00
|
|
|
} else if (entity != null) {
|
2024-02-21 10:55:34 +01:00
|
|
|
@@ -78,7 +97,7 @@
|
|
|
|
entity.resetFallDistance();
|
|
|
|
}
|
|
|
|
|
|
|
|
- this.discard();
|
|
|
|
+ this.discard(EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
@@ -88,7 +107,7 @@
|
|
|
|
Entity entity = this.getOwner();
|
|
|
|
|
|
|
|
if (entity instanceof EntityPlayer && !entity.isAlive() && this.level().getGameRules().getBoolean(GameRules.RULE_ENDER_PEARLS_VANISH_ON_DEATH)) {
|
|
|
|
- this.discard();
|
|
|
|
+ this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
|
|
|
|
} else {
|
|
|
|
super.tick();
|
|
|
|
}
|
|
|
|
@@ -100,7 +119,7 @@
|
2021-11-21 23:00:00 +01:00
|
|
|
public Entity changeDimension(WorldServer worldserver) {
|
|
|
|
Entity entity = this.getOwner();
|
2020-08-28 04:28:06 +02:00
|
|
|
|
2023-06-07 17:30:00 +02:00
|
|
|
- if (entity != null && entity.level().dimension() != worldserver.dimension()) {
|
|
|
|
+ if (entity != null && worldserver != null && entity.level().dimension() != worldserver.dimension()) { // CraftBukkit - SPIGOT-6113
|
2021-11-21 23:00:00 +01:00
|
|
|
this.setOwner((Entity) null);
|
2020-08-28 04:28:06 +02:00
|
|
|
}
|
|
|
|
|