diff --git a/patches/api/0033-Item-entity-immunities.patch b/patches/api/0033-Item-entity-immunities.patch new file mode 100644 index 000000000..642abba06 --- /dev/null +++ b/patches/api/0033-Item-entity-immunities.patch @@ -0,0 +1,45 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: William Blake Galbreath +Date: Sat, 22 Aug 2020 17:42:08 -0500 +Subject: [PATCH] Item entity immunities + + +diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java +index acd80d812..810a1e55c 100644 +--- a/src/main/java/org/bukkit/entity/Item.java ++++ b/src/main/java/org/bukkit/entity/Item.java +@@ -87,4 +87,34 @@ public interface Item extends Entity { + */ + public void setThrower(@Nullable UUID thrower); + // Paper end ++ ++ // Purpur start ++ /** ++ * Set whether or not this item is immune to explosions ++ * ++ * @param immuneToExplosion True to make immune to explosions ++ */ ++ void setImmuneToExplosion(boolean immuneToExplosion); ++ ++ /** ++ * Check if item is immune to explosions ++ * ++ * @return True if immune to explosions ++ */ ++ boolean isImmuneToExplosion(); ++ ++ /** ++ * Set whether or not this item is immune to fire ++ * ++ * @param immuneToFire True to make immune to fire ++ */ ++ void setImmuneToFire(boolean immuneToFire); ++ ++ /** ++ * Check if item is immune to fire ++ * ++ * @return True if immune to fire ++ */ ++ boolean isImmuneToFire(); ++ // Purpur end + } diff --git a/patches/server/0091-Add-item-entity-options.patch b/patches/server/0091-Add-item-entity-options.patch deleted file mode 100644 index a87b14418..000000000 --- a/patches/server/0091-Add-item-entity-options.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Sat, 22 Feb 2020 15:54:08 -0600 -Subject: [PATCH] Add item entity options - - -diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index b3a28d1b8d..7b3ea5c741 100644 ---- a/src/main/java/net/minecraft/server/Entity.java -+++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1450,6 +1450,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke - - } - -+ public boolean isInLiquid(Tag tag) { return a(tag); } // Purpur - OBFHELPER - public boolean a(Tag tag) { - return this.O == tag; - } -diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index e1372620fc..d22021cfb8 100644 ---- a/src/main/java/net/minecraft/server/EntityItem.java -+++ b/src/main/java/net/minecraft/server/EntityItem.java -@@ -263,7 +263,7 @@ public class EntityItem extends Entity { - - @Override - public boolean isFireProof() { -- return this.getItemStack().getItem().u() || super.isFireProof(); -+ return this.getItemStack().getItem().u() || super.isFireProof() || world.purpurConfig.itemImmuneToFire.contains(getItemStack().getItem()); - } - - @Override -@@ -274,6 +274,8 @@ public class EntityItem extends Entity { - return false; - } else if (!this.getItemStack().getItem().a(damagesource)) { - return false; -+ } else if ((damagesource.isFire() || damagesource == DamageSource.FIRE) && world.purpurConfig.itemImmuneToFire.contains(getItemStack().getItem())) { return false; // Purpur -+ } else if (damagesource.isExplosion() && world.purpurConfig.itemImmuneToExplosion.contains(getItemStack().getItem())) { return false; // Purpur - } else { - // CraftBukkit start - if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index d1b0d40307..9de7246862 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -99,6 +99,21 @@ public class PurpurWorldConfig { - } - } - -+ public List itemImmuneToExplosion = new ArrayList<>(); -+ public List itemImmuneToFire = new ArrayList<>(); -+ private void itemSettings() { -+ itemImmuneToExplosion.clear(); -+ getList("gameplay-mechanics.item.immune.explosion", new ArrayList<>()).forEach(key -> { -+ Item item = IRegistry.ITEM.get(new MinecraftKey(key.toString())); -+ if (item != Items.AIR) itemImmuneToExplosion.add(item); -+ }); -+ itemImmuneToFire.clear(); -+ getList("gameplay-mechanics.item.immune.fire", new ArrayList<>()).forEach(key -> { -+ Item item = IRegistry.ITEM.get(new MinecraftKey(key.toString())); -+ if (item != Items.AIR) itemImmuneToFire.add(item); -+ }); -+ } -+ - public boolean idleTimeoutKick = true; - public boolean idleTimeoutTickNearbyEntities = true; - public boolean idleTimeoutCountAsSleeping = false; diff --git a/patches/server/0091-Item-entity-immunities.patch b/patches/server/0091-Item-entity-immunities.patch new file mode 100644 index 000000000..7fcb75a67 --- /dev/null +++ b/patches/server/0091-Item-entity-immunities.patch @@ -0,0 +1,146 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: William Blake Galbreath +Date: Sat, 22 Feb 2020 15:54:08 -0600 +Subject: [PATCH] Item entity immunities + + +diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java +index 79e6f4361..6c64f86b7 100644 +--- a/src/main/java/net/minecraft/server/Entity.java ++++ b/src/main/java/net/minecraft/server/Entity.java +@@ -1450,6 +1450,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke + + } + ++ public boolean isInLiquid(Tag tag) { return a(tag); } // Purpur - OBFHELPER + public boolean a(Tag tag) { + return this.O == tag; + } +diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java +index cfb31c412..3afc38810 100644 +--- a/src/main/java/net/minecraft/server/EntityItem.java ++++ b/src/main/java/net/minecraft/server/EntityItem.java +@@ -23,6 +23,8 @@ public class EntityItem extends Entity { + public final float b; + private int lastTick = MinecraftServer.currentTick - 1; // CraftBukkit + public boolean canMobPickup = true; // Paper ++ public boolean immuneToExplosion = false; // Purpur ++ public boolean immuneToFire = false; // Purpur + + public EntityItem(EntityTypes entitytypes, World world) { + super(entitytypes, world); +@@ -274,6 +276,12 @@ public class EntityItem extends Entity { + return false; + } else if (!this.getItemStack().getItem().a(damagesource)) { + return false; ++ // Purpur start ++ } else if (immuneToFire && (damagesource.isFire() || damagesource == DamageSource.FIRE)) { ++ return false; ++ } else if (immuneToExplosion && damagesource.isExplosion()) { ++ respawnOnClient(); return false; ++ // Purpur end + } else { + // CraftBukkit start + if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) { +@@ -453,6 +461,8 @@ public class EntityItem extends Entity { + com.google.common.base.Preconditions.checkArgument(!itemstack.isEmpty(), "Cannot drop air"); // CraftBukkit + this.getDataWatcher().set(EntityItem.ITEM, itemstack); + this.getDataWatcher().markDirty(EntityItem.ITEM); // CraftBukkit - SPIGOT-4591, must mark dirty ++ if (world.purpurConfig.itemImmuneToExplosion.contains(itemstack.getItem())) immuneToExplosion = true; // Purpur ++ if (world.purpurConfig.itemImmuneToFire.contains(itemstack.getItem())) immuneToFire = true; // Purpur + } + + @Override +@@ -522,4 +532,15 @@ public class EntityItem extends Entity { + public Packet P() { + return new PacketPlayOutSpawnEntity(this); + } ++ ++ // Purpur start ++ public void respawnOnClient() { ++ Packet spawnPacket = new PacketPlayOutSpawnEntity(this); ++ Packet metadataPacket = new PacketPlayOutEntityMetadata(getId(), getDataWatcher(), true); ++ for (EntityPlayer entityplayer : getTracker().trackerEntry.trackedPlayers) { ++ entityplayer.playerConnection.sendPacket(spawnPacket); ++ entityplayer.playerConnection.sendPacket(metadataPacket); ++ } ++ } ++ // Purpur end + } +diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java +index c64bbde28..3c1cf5903 100644 +--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java ++++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java +@@ -106,6 +106,15 @@ public class EntityTrackerEntry { + this.c(); + } + ++ // Purpur start - respawn burning item entities on client (client kills them) ++ if (tracker.fireTicks > 0 && tracker instanceof EntityItem) { ++ EntityItem item = (EntityItem) tracker; ++ if (item.immuneToFire && !item.dead) { ++ item.respawnOnClient(); ++ } ++ } ++ // Purpur end ++ + if (this.tickCounter % this.d == 0 || this.tracker.impulse || this.tracker.getDataWatcher().a()) { + int i; + int j; +diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +index d1b0d4030..9de724686 100644 +--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java ++++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +@@ -99,6 +99,21 @@ public class PurpurWorldConfig { + } + } + ++ public List itemImmuneToExplosion = new ArrayList<>(); ++ public List itemImmuneToFire = new ArrayList<>(); ++ private void itemSettings() { ++ itemImmuneToExplosion.clear(); ++ getList("gameplay-mechanics.item.immune.explosion", new ArrayList<>()).forEach(key -> { ++ Item item = IRegistry.ITEM.get(new MinecraftKey(key.toString())); ++ if (item != Items.AIR) itemImmuneToExplosion.add(item); ++ }); ++ itemImmuneToFire.clear(); ++ getList("gameplay-mechanics.item.immune.fire", new ArrayList<>()).forEach(key -> { ++ Item item = IRegistry.ITEM.get(new MinecraftKey(key.toString())); ++ if (item != Items.AIR) itemImmuneToFire.add(item); ++ }); ++ } ++ + public boolean idleTimeoutKick = true; + public boolean idleTimeoutTickNearbyEntities = true; + public boolean idleTimeoutCountAsSleeping = false; +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +index cb756b1ba..59b51f94e 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +@@ -94,4 +94,26 @@ public class CraftItem extends CraftEntity implements Item { + public EntityType getType() { + return EntityType.DROPPED_ITEM; + } ++ ++ // Purpur start ++ @Override ++ public void setImmuneToExplosion(boolean immuneToExplosion) { ++ item.immuneToExplosion = immuneToExplosion; ++ } ++ ++ @Override ++ public boolean isImmuneToExplosion() { ++ return item.immuneToExplosion; ++ } ++ ++ @Override ++ public void setImmuneToFire(boolean immuneToFire) { ++ item.immuneToFire = immuneToFire; ++ } ++ ++ @Override ++ public boolean isImmuneToFire() { ++ return item.immuneToFire; ++ } ++ // Purpur end + }