mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-09 03:43:40 +01:00
SPIGOT-4199: Riptide related APIs
By: md_5 <git@md-5.net>
This commit is contained in:
parent
9fedd75309
commit
bb6a5d8612
2 changed files with 32 additions and 0 deletions
27
paper-server/nms-patches/ItemTrident.patch
Normal file
27
paper-server/nms-patches/ItemTrident.patch
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
--- a/net/minecraft/server/ItemTrident.java
|
||||||
|
+++ b/net/minecraft/server/ItemTrident.java
|
||||||
|
@@ -6,9 +6,13 @@
|
||||||
|
|
||||||
|
public ItemTrident(Item.Info item_info) {
|
||||||
|
super(item_info);
|
||||||
|
+ // CraftBukkit start - obfuscator went a little crazy
|
||||||
|
+ /*
|
||||||
|
this.a(new MinecraftKey("throwing"), (itemstack, world, entityliving) -> {
|
||||||
|
return entityliving != null && entityliving.isHandRaised() && entityliving.cW() == itemstack ? 1.0F : 0.0F;
|
||||||
|
});
|
||||||
|
+ */
|
||||||
|
+ // CraftBukkit end
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean a(IBlockData iblockdata, World world, BlockPosition blockposition, EntityHuman entityhuman) {
|
||||||
|
@@ -53,6 +57,10 @@
|
||||||
|
SoundEffect soundeffect = SoundEffects.ITEM_TRIDENT_THROW;
|
||||||
|
|
||||||
|
if (k > 0) {
|
||||||
|
+ // CraftBukkit start
|
||||||
|
+ org.bukkit.event.player.PlayerRiptideEvent event = new org.bukkit.event.player.PlayerRiptideEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack));
|
||||||
|
+ event.getPlayer().getServer().getPluginManager().callEvent(event);
|
||||||
|
+ // CraftBukkit end
|
||||||
|
float f = entityhuman.yaw;
|
||||||
|
float f1 = entityhuman.pitch;
|
||||||
|
float f2 = -MathHelper.sin(f * 0.017453292F) * MathHelper.cos(f1 * 0.017453292F);
|
|
@ -478,6 +478,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
||||||
getHandle().setSwimming(swimming);
|
getHandle().setSwimming(swimming);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isRiptiding() {
|
||||||
|
return getHandle().cO();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AttributeInstance getAttribute(Attribute attribute) {
|
public AttributeInstance getAttribute(Attribute attribute) {
|
||||||
return getHandle().craftAttributes.getAttribute(attribute);
|
return getHandle().craftAttributes.getAttribute(attribute);
|
||||||
|
|
Loading…
Reference in a new issue