Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 28ba41986d | |||
| cde9bed6dc | |||
| 1ea5d62b57 |
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>me.youhavetrouble</groupId>
|
<groupId>me.youhavetrouble</groupId>
|
||||||
<artifactId>BeHappyThatItHappened</artifactId>
|
<artifactId>BeHappyThatItHappened</artifactId>
|
||||||
<version>1.1</version>
|
<version>1.2</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>BeHappyThatItHappened</name>
|
<name>BeHappyThatItHappened</name>
|
||||||
@@ -69,7 +69,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.papermc.paper</groupId>
|
<groupId>io.papermc.paper</groupId>
|
||||||
<artifactId>paper-api</artifactId>
|
<artifactId>paper-api</artifactId>
|
||||||
<version>1.18.1-R0.1-SNAPSHOT</version>
|
<version>1.19.4-R0.1-SNAPSHOT</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|||||||
@@ -1,12 +1,15 @@
|
|||||||
package me.youhavetrouble.behappythatithappened;
|
package me.youhavetrouble.behappythatithappened;
|
||||||
|
|
||||||
|
import io.papermc.paper.event.entity.TameableDeathMessageEvent;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
import net.kyori.adventure.text.format.NamedTextColor;
|
import net.kyori.adventure.text.format.NamedTextColor;
|
||||||
import net.kyori.adventure.text.format.TextDecoration;
|
import net.kyori.adventure.text.format.TextDecoration;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.NamespacedKey;
|
import org.bukkit.NamespacedKey;
|
||||||
import org.bukkit.entity.EntityType;
|
import org.bukkit.entity.EntityType;
|
||||||
|
import org.bukkit.entity.Mob;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.entity.Tameable;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
@@ -38,6 +41,11 @@ public class SadMomentListener implements Listener {
|
|||||||
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
|
||||||
public void onSadMoment(EntityDeathEvent event) {
|
public void onSadMoment(EntityDeathEvent event) {
|
||||||
if (event.getEntityType().equals(EntityType.PLAYER)) return;
|
if (event.getEntityType().equals(EntityType.PLAYER)) return;
|
||||||
|
if (!(event.getEntity() instanceof Mob)) return;
|
||||||
|
if (event.getEntity() instanceof Tameable) {
|
||||||
|
Tameable pet = (Tameable) event.getEntity();
|
||||||
|
if (pet.isTamed()) return;
|
||||||
|
}
|
||||||
Component inMemoryOf = event.getEntity().customName();
|
Component inMemoryOf = event.getEntity().customName();
|
||||||
if (inMemoryOf == null) return;
|
if (inMemoryOf == null) return;
|
||||||
|
|
||||||
@@ -55,6 +63,14 @@ public class SadMomentListener implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
|
||||||
|
public void onSevereLossMoment(TameableDeathMessageEvent event) {
|
||||||
|
if (!plugin.renamedMobsDropTag) return;
|
||||||
|
if (!event.getEntity().isTamed()) return;
|
||||||
|
ItemStack memento = getMemento(event.getEntity().customName(), event.deathMessage());
|
||||||
|
event.getEntity().getWorld().dropItemNaturally(event.getEntity().getLocation(), memento);
|
||||||
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
|
||||||
public void onLossMoment(PlayerDeathEvent event) {
|
public void onLossMoment(PlayerDeathEvent event) {
|
||||||
if (!plugin.playersDropTag) return;
|
if (!plugin.playersDropTag) return;
|
||||||
@@ -109,6 +125,8 @@ public class SadMomentListener implements Listener {
|
|||||||
.color(NamedTextColor.GRAY)
|
.color(NamedTextColor.GRAY)
|
||||||
);
|
);
|
||||||
meta.lore(lore);
|
meta.lore(lore);
|
||||||
|
} else {
|
||||||
|
meta.lore(null);
|
||||||
}
|
}
|
||||||
nametag .setItemMeta(meta);
|
nametag .setItemMeta(meta);
|
||||||
return nametag;
|
return nametag;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
name: BeHappyThatItHappened
|
name: BeHappyThatItHappened
|
||||||
version: '${project.version}'
|
version: '${project.version}'
|
||||||
main: me.youhavetrouble.behappythatithappened.BeHappyThatItHappened
|
main: me.youhavetrouble.behappythatithappened.BeHappyThatItHappened
|
||||||
api-version: 1.18
|
api-version: 1.19
|
||||||
authors: [ YouHaveTrouble ]
|
authors: [ YouHaveTrouble ]
|
||||||
description: Don't be sad that they're gone, be happy they happened
|
description: Don't be sad that they're gone, be happy they happened
|
||||||
website: youhavetrouble.me
|
website: youhavetrouble.me
|
||||||
|
|||||||
Reference in New Issue
Block a user