~williewillus/violet-moon

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
2 2

[PATCH botania] Fake bursts no longer trigger game events

Details
Message ID
<20230519041704.515681-1-vincent@vincent-lee.net>
DKIM signature
missing
Download raw message
Patch: +15 -0
Kludgy fix but can't think of anything better for now.
Closes #4348
---
 .../botania/common/entity/ManaBurstEntity.java    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Xplat/src/main/java/vazkii/botania/common/entity/ManaBurstEntity.java b/Xplat/src/main/java/vazkii/botania/common/entity/ManaBurstEntity.java
index 900073a90..af3c02189 100644
--- a/Xplat/src/main/java/vazkii/botania/common/entity/ManaBurstEntity.java
+++ b/Xplat/src/main/java/vazkii/botania/common/entity/ManaBurstEntity.java
@@ -465,6 +465,21 @@ public float getParticleSize() {
		return (float) getMana() / (float) getStartingMana();
	}

	@Override
	protected void onHit(HitResult hit) {
		if (isFake()) {
			// [VanillaCopy] super, without firing gameEvents
			HitResult.Type type = hit.getType();
			if (type == HitResult.Type.ENTITY) {
				this.onHitEntity((EntityHitResult) hit);
			} else if (type == HitResult.Type.BLOCK) {
				this.onHitBlock((BlockHitResult) hit);
			}
		} else {
			super.onHit(hit);
		}
	}

	@Override
	protected void onHitBlock(@NotNull BlockHitResult hit) {
		if (!isFake()) {
-- 
2.40.1

[botania/patches/linux.yml] build success

builds.sr.ht <builds@sr.ht>
Details
Message ID
<CSPZ319YUSAD.AGUM5Q4C6GIC@cirno2>
In-Reply-To
<20230519041704.515681-1-vincent@vincent-lee.net> (view parent)
DKIM signature
missing
Download raw message
botania/patches/linux.yml: SUCCESS in 17m8s

[Fake bursts no longer trigger game events][0] from [Vincent Lee][1]

[0]: https://lists.sr.ht/~williewillus/violet-moon/patches/41266
[1]: vincent@vincent-lee.net

✓ #992260 SUCCESS botania/patches/linux.yml https://builds.sr.ht/~williewillus/job/992260
Details
Message ID
<fhw4vfbl2ofqmoxhq6ynpvq35vaqbesi7xcgpe6zcwjbo7lna2@waldj6mhyw4c>
In-Reply-To
<20230519041704.515681-1-vincent@vincent-lee.net> (view parent)
DKIM signature
missing
Download raw message
lgtm
Reply to thread Export thread (mbox)