Update to Minecraft 1.20.2

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2023-09-22 02:40:00 +10:00
parent 193398c0ff
commit 8a3c8cfcd4
238 changed files with 2448 additions and 2344 deletions

View File

@@ -13,25 +13,7 @@
public class EntityAreaEffectCloud extends Entity implements TraceableEntity {
private static final Logger LOGGER = LogUtils.getLogger();
@@ -44,7 +50,7 @@
private static final float DEFAULT_RADIUS = 3.0F;
public static final float DEFAULT_WIDTH = 6.0F;
public static final float HEIGHT = 0.5F;
- private PotionRegistry potion;
+ public PotionRegistry potion; // CraftBukkit - private -> public
public List<MobEffect> effects;
private final Map<Entity, Integer> victims;
private int duration;
@@ -112,7 +118,7 @@
}
- private void updateColor() {
+ public void updateColor() { // Craftbukkit - private -> public
if (this.potion == Potions.EMPTY && this.effects.isEmpty()) {
this.getEntityData().set(EntityAreaEffectCloud.DATA_COLOR, 0);
} else {
@@ -263,6 +269,7 @@
@@ -264,6 +270,7 @@
if (!list1.isEmpty()) {
Iterator iterator1 = list1.iterator();
@@ -39,7 +21,7 @@
while (iterator1.hasNext()) {
EntityLiving entityliving = (EntityLiving) iterator1.next();
@@ -272,6 +279,17 @@
@@ -273,6 +280,17 @@
double d8 = d6 * d6 + d7 * d7;
if (d8 <= (double) (f * f)) {
@@ -57,7 +39,7 @@
this.victims.put(entityliving, this.tickCount + this.reapplicationDelay);
Iterator iterator2 = list.iterator();
@@ -281,7 +299,7 @@
@@ -282,7 +300,7 @@
if (mobeffect1.getEffect().isInstantenous()) {
mobeffect1.getEffect().applyInstantenousEffect(this, this.getOwner(), entityliving, mobeffect1.getAmplifier(), 0.5D);
} else {