Update to Minecraft 1.19.3

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2022-12-08 03:00:00 +11:00
parent a13136ada2
commit 8b26bb8f3e
305 changed files with 3331 additions and 2864 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/EntityAreaEffectCloud.java
+++ b/net/minecraft/world/entity/EntityAreaEffectCloud.java
@@ -32,6 +32,12 @@
@@ -31,6 +31,12 @@
import net.minecraft.world.level.material.EnumPistonReaction;
import org.slf4j.Logger;
@@ -13,7 +13,7 @@
public class EntityAreaEffectCloud extends Entity {
private static final Logger LOGGER = LogUtils.getLogger();
@@ -127,6 +133,22 @@
@@ -129,6 +135,22 @@
}
@@ -25,18 +25,18 @@
+ }
+
+ public String getPotionType() {
+ return ((MinecraftKey) IRegistry.POTION.getKey(this.potion)).toString();
+ return ((MinecraftKey) BuiltInRegistries.POTION.getKey(this.potion)).toString();
+ }
+
+ public void setPotionType(String string) {
+ setPotion(IRegistry.POTION.get(new MinecraftKey(string)));
+ setPotion(BuiltInRegistries.POTION.get(new MinecraftKey(string)));
+ }
+ // CraftBukkit end
+
public int getColor() {
return (Integer) this.getEntityData().get(EntityAreaEffectCloud.DATA_COLOR);
}
@@ -259,6 +281,7 @@
@@ -261,6 +283,7 @@
if (!list1.isEmpty()) {
Iterator iterator1 = list1.iterator();
@@ -44,7 +44,7 @@
while (iterator1.hasNext()) {
EntityLiving entityliving = (EntityLiving) iterator1.next();
@@ -268,6 +291,17 @@
@@ -270,6 +293,17 @@
double d8 = d6 * d6 + d7 * d7;
if (d8 <= (double) (f * f)) {
@@ -62,7 +62,7 @@
this.victims.put(entityliving, this.tickCount + this.reapplicationDelay);
Iterator iterator2 = list.iterator();
@@ -277,7 +311,7 @@
@@ -279,7 +313,7 @@
if (mobeffect1.getEffect().isInstantenous()) {
mobeffect1.getEffect().applyInstantenousEffect(this, this.getOwner(), entityliving, mobeffect1.getAmplifier(), 0.5D);
} else {