13
0
geforkt von Mirrors/Paper

SPIGOT-4199: Riptide related APIs

Dieser Commit ist enthalten in:
md_5 2018-08-02 09:38:52 +10:00
Ursprung ab5599e8f3
Commit 272426acd7
2 geänderte Dateien mit 32 neuen und 0 gelöschten Zeilen

Datei anzeigen

@ -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);

Datei anzeigen

@ -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);