Add OMINOUS_ITEM_SPAWNER SpawnReason (#10897)

1 files changed, 39 insertions, 0 deletions

diff --git a/patches/server/0876-Allow-trident-custom-damage.patch b/patches/server/0876-Allow-trident-custom-damage.patch
new file mode 100644
index 0000000000..95137bd7d5
--- /dev/null
+++ b/patches/server/0876-Allow-trident-custom-damage.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lulu13022002 <[email protected]>
+Date: Tue, 12 Jul 2022 18:01:14 +0200
+Subject: [PATCH] Allow trident custom damage
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
+index e45c3a9805d9fac1fabe6d891c817743acd9969e..44c733c5b2c3e9942f28e882ad72306a24459c2c 100644
+--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
+@@ -36,16 +36,19 @@ public class ThrownTrident extends AbstractArrow {
+ 
+     public ThrownTrident(EntityType<? extends ThrownTrident> type, Level world) {
+         super(type, world);
++        this.setBaseDamage(net.minecraft.world.item.TridentItem.BASE_DAMAGE); // Paper - Allow trident custom damage
+     }
+ 
+     public ThrownTrident(Level world, LivingEntity owner, ItemStack stack) {
+         super(EntityType.TRIDENT, owner, world, stack, (ItemStack) null);
++        this.setBaseDamage(net.minecraft.world.item.TridentItem.BASE_DAMAGE); // Paper - Allow trident custom damage
+         this.entityData.set(ThrownTrident.ID_LOYALTY, this.getLoyaltyFromItem(stack));
+         this.entityData.set(ThrownTrident.ID_FOIL, stack.hasFoil());
+     }
+ 
+     public ThrownTrident(Level world, double x, double y, double z, ItemStack stack) {
+         super(EntityType.TRIDENT, x, y, z, world, stack, stack);
++        this.setBaseDamage(net.minecraft.world.item.TridentItem.BASE_DAMAGE); // Paper - Allow trident custom damage
+         this.entityData.set(ThrownTrident.ID_LOYALTY, this.getLoyaltyFromItem(stack));
+         this.entityData.set(ThrownTrident.ID_FOIL, stack.hasFoil());
+     }
+@@ -129,7 +132,7 @@ public class ThrownTrident extends AbstractArrow {
+     @Override
+     protected void onHitEntity(EntityHitResult entityHitResult) {
+         Entity entity = entityHitResult.getEntity();
+-        float f = 8.0F;
++        float f = (float) this.getBaseDamage(); // Paper - Allow trident custom damage
+         Entity entity1 = this.getOwner();
+         DamageSource damagesource = this.damageSources().trident(this, (Entity) (entity1 == null ? this : entity1));
+         Level world = this.level();