geforkt von Mirrors/Paper
43 Zeilen
2.8 KiB
Diff
43 Zeilen
2.8 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||
|
Date: Fri, 18 Mar 2022 21:15:55 -0700
|
||
|
Subject: [PATCH] Add EntityDyeEvent and CollarColorable interface
|
||
|
|
||
|
|
||
|
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
|
||
|
index e4eac546836b73b5e9c8fd68ca0d32c01148313e..9f5180271ca8a790aa52763ac46d31b905c9d477 100644
|
||
|
--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
|
||
|
+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
|
||
|
@@ -432,6 +432,13 @@ public class Cat extends TamableAnimal {
|
||
|
DyeColor enumcolor = ((DyeItem) item).getDyeColor();
|
||
|
|
||
|
if (enumcolor != this.getCollarColor()) {
|
||
|
+ // Paper start
|
||
|
+ final io.papermc.paper.event.entity.EntityDyeEvent event = new io.papermc.paper.event.entity.EntityDyeEvent(this.getBukkitEntity(), org.bukkit.DyeColor.getByWoolData((byte) enumcolor.getId()), ((net.minecraft.server.level.ServerPlayer) player).getBukkitEntity());
|
||
|
+ if (!event.callEvent()) {
|
||
|
+ return InteractionResult.FAIL;
|
||
|
+ }
|
||
|
+ enumcolor = DyeColor.byId(event.getColor().getWoolData());
|
||
|
+ // Paper end
|
||
|
this.setCollarColor(enumcolor);
|
||
|
if (!player.getAbilities().instabuild) {
|
||
|
itemstack.shrink(1);
|
||
|
diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
||
|
index aaf7096835bab3a42d617553dd83e048e4a83766..249ef89342d2811614507090b79250adf78e33ce 100644
|
||
|
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
||
|
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
||
|
@@ -393,6 +393,13 @@ public class Wolf extends TamableAnimal implements NeutralMob {
|
||
|
DyeColor enumcolor = ((DyeItem) item).getDyeColor();
|
||
|
|
||
|
if (enumcolor != this.getCollarColor()) {
|
||
|
+ // Paper start
|
||
|
+ final io.papermc.paper.event.entity.EntityDyeEvent event = new io.papermc.paper.event.entity.EntityDyeEvent(this.getBukkitEntity(), org.bukkit.DyeColor.getByWoolData((byte) enumcolor.getId()), ((net.minecraft.server.level.ServerPlayer) player).getBukkitEntity());
|
||
|
+ if (!event.callEvent()) {
|
||
|
+ return InteractionResult.FAIL;
|
||
|
+ }
|
||
|
+ enumcolor = DyeColor.byId(event.getColor().getWoolData());
|
||
|
+ // Paper end
|
||
|
this.setCollarColor(enumcolor);
|
||
|
if (!player.getAbilities().instabuild) {
|
||
|
itemstack.shrink(1);
|