FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-05-12 22:30:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

1.20.2-rc1

Browse source
This commit is contained in:
modmuss50 2023-09-15 15:27:05 +01:00
parent 109a65e5af
commit daef22a2cb
3 changed files with 3 additions and 54 deletions
fabric-events-interaction-v0/src/main
java/net/fabricmc/fabric/mixin/event/interaction
BeehiveBlockMixin.java
resources
fabric-events-interaction-v0.mixins.json

50
fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/BeehiveBlockMixin.java
View file

@ -1,50 +0,0 @@
/*
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.fabricmc.fabric.mixin.event.interaction;
import java.util.List;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
import net.minecraft.block.BeehiveBlock;
import net.minecraft.entity.passive.BeeEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
@Mixin(BeehiveBlock.class)
class BeehiveBlockMixin {
@Inject(
method = "angerNearbyBees",
cancellable = true,
at = @At(
value = "INVOKE_ASSIGN",
target = "Lnet/minecraft/world/World;getNonSpectatingEntities(Ljava/lang/Class;Lnet/minecraft/util/math/Box;)Ljava/util/List;",
ordinal = 1 // Only capture the PlayerEntity call.
),
locals = LocalCapture.CAPTURE_FAILHARD
)
private void afterNearbyBeesPlayers(World world, BlockPos pos, CallbackInfo ci, List<BeeEntity> bees, List<PlayerEntity> players) {
// If a fake player broke the beehive, there will be no nearby players. This causes a crash later on as we try
// to pick a random player - we early return to avoid this.
if (players.isEmpty()) ci.cancel();
}
}

1
fabric-events-interaction-v0/src/main/resources/fabric-events-interaction-v0.mixins.json
View file

@ -3,7 +3,6 @@
"package": "net.fabricmc.fabric.mixin.event.interaction",
"compatibilityLevel": "JAVA_16",
"mixins": [
"BeehiveBlockMixin",
"PlayerAdvancementTrackerMixin",
"ServerPlayerEntityMixin",
"ServerPlayerInteractionManagerMixin",