mirror of
https://github.com/barkeser2002/CatServer.git
synced 2026-09-25 07:19:56 +03:00
37 lines
1.7 KiB
Diff
37 lines
1.7 KiB
Diff
--- ../src-base/minecraft/net/minecraft/item/ItemChorusFruit.java
|
|
+++ ../src-work/minecraft/net/minecraft/item/ItemChorusFruit.java
|
|
@@ -2,10 +2,14 @@
|
|
|
|
import net.minecraft.entity.EntityLivingBase;
|
|
import net.minecraft.entity.player.EntityPlayer;
|
|
+import net.minecraft.entity.player.EntityPlayerMP;
|
|
import net.minecraft.init.SoundEvents;
|
|
import net.minecraft.util.SoundCategory;
|
|
import net.minecraft.util.math.MathHelper;
|
|
import net.minecraft.world.World;
|
|
+import org.bukkit.Location;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.player.PlayerTeleportEvent;
|
|
|
|
public class ItemChorusFruit extends ItemFood
|
|
{
|
|
@@ -30,6 +34,18 @@
|
|
double d4 = MathHelper.clamp(entityLiving.posY + (double)(entityLiving.getRNG().nextInt(16) - 8), 0.0D, (double)(worldIn.getActualHeight() - 1));
|
|
double d5 = entityLiving.posZ + (entityLiving.getRNG().nextDouble() - 0.5D) * 16.0D;
|
|
|
|
+ if (entityLiving instanceof EntityPlayerMP) {
|
|
+ Player player = ((EntityPlayerMP) entityLiving).getBukkitEntity();
|
|
+ PlayerTeleportEvent teleEvent = new PlayerTeleportEvent(player, player.getLocation(), new Location(player.getWorld(), d3, d4, d5), PlayerTeleportEvent.TeleportCause.CHORUS_FRUIT);
|
|
+ worldIn.getServer().getPluginManager().callEvent(teleEvent);
|
|
+ if (teleEvent.isCancelled()) {
|
|
+ break;
|
|
+ }
|
|
+ d3 = teleEvent.getTo().getX();
|
|
+ d4 = teleEvent.getTo().getY();
|
|
+ d5 = teleEvent.getTo().getZ();
|
|
+ }
|
|
+
|
|
if (entityLiving.isRiding())
|
|
{
|
|
entityLiving.dismountRidingEntity();
|