core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0354-MC-114618-Fix-EntityAr...

25 lines
1.0 KiB
Diff
Raw Normal View History

Rebuild all patches using the new rebuild pattern
2020-05-06 09:48:49 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
MC-114618 - Fix EntityAreaEffectCloud from going negative size
2019-05-27 22:36:06 +00:00
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Mon, 27 May 2019 17:35:39 -0500
Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative
size
diff --git a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#4728) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 30885166 Update to Minecraft 1.16.4 CraftBukkit Changes: 3af81c71 Update to Minecraft 1.16.4 Spigot Changes: f011ca24 Update to Minecraft 1.16.4 Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>
2020-11-03 02:22:15 +00:00
index f04204b8722a061a09e2b3cad6c67ab5fdd8f071..5b0ee830b45a677bf354b02cf4fd311d842e7678 100644
MC-114618 - Fix EntityAreaEffectCloud from going negative size
2019-05-27 22:36:06 +00:00
--- a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
+++ b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#2415) * fixup patch and rebuild * Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: bde198c9 SPIGOT-5246: PlayerQuitEvent.get/setQuitMessage() is incorrectly marked as NotNull 24ad5a79 SPIGOT-5240: Vector.angle not valid for angles very close to each other a143db9a SPIGOT-5231: ShotAtAngle API for Fireworks 10db5c3d SPIGOT-5226: Update Javadoc of PlayerDeathEvent CraftBukkit Changes: 1ec1b05e SPIGOT-5245: Unneeded cast to WorldNBTStorage in CraftWorld#getWorldFolder e5e8eec2 SPIGOT-5241: setAttributeModifiers does not work on untouched stack 803eaa31 SPIGOT-5231: ShotAtAngle API for Fireworks 7881d2ae SPIGOT-5237: Horses, pigs do not drop their inventory 06efc9ec Don't accept connections until all plugins have enabled da62a66a SPIGOT-5225: World handle isn't closed if world is unloaded without saving 104b3831 SPIGOT-5222: Cannot get Long values from Entity memory f0b3fe43 SPIGOT-5220: Server CPU usage reaches 100% when stdin is null Spigot Changes: e5b1b5db SPIGOT-5235: Destroy expired area effect clouds / fireworks that are inactive cbcc8e87 Make region files more reliable to write to 8887c5f4 Remove redundant late-bind option dac29063 Rebuild patches * Preserve old flush on save flag for reliable regionfiles Originally this patch was in paper * Fix some issues with the death event - Entities potentially entering a glitched state to the client where they appear to be falling over - Donkeys losing their chest if the event was cancelled (only an issue since the upstream merge) - Some wither death logic running for an entity killed by a wither
2019-08-05 16:35:40 +00:00
@@ -175,6 +175,12 @@ public class EntityAreaEffectCloud extends Entity {
MC-114618 - Fix EntityAreaEffectCloud from going negative size
2019-05-27 22:36:06 +00:00
super.tick();
even even even more work
2020-06-25 14:09:55 +00:00
boolean flag = this.k();
MC-114618 - Fix EntityAreaEffectCloud from going negative size
2019-05-27 22:36:06 +00:00
float f = this.getRadius();
+ // Paper start - fix MC-114618
Rework fix for MC-114618 so not break map maker's workflow. Fixes #2221
2019-06-23 19:31:33 +00:00
+ if (f < 0.0F) {
MC-114618 - Fix EntityAreaEffectCloud from going negative size
2019-05-27 22:36:06 +00:00
+ this.die();
+ return;
+ }
+ // Paper end
if (this.world.isClientSide) {
ParticleParam particleparam = this.getParticle();