Skip to content

Commit 04eaae1

Browse files
committed
Fix NeoForge crash
1 parent 9aeb27f commit 04eaae1

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 2.2.4
2+
3+
- Fix crash on NeoForge alongside FTBTeams
4+
15
# 2.2.3
26

37
- Improve FTB Teams support, thanks to Muon #115

common/src/main/java/net/bettercombat/compat/FTBTeamsCompat.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
import dev.ftb.mods.ftbteams.api.FTBTeamsAPI;
44
import dev.ftb.mods.ftbteams.api.client.KnownClientPlayer;
5+
import net.bettercombat.Platform;
56
import net.bettercombat.logic.TargetHelper;
6-
import net.fabricmc.loader.api.FabricLoader;
77
import net.minecraft.entity.player.PlayerEntity;
88

99
import java.util.Optional;
1010

1111
public class FTBTeamsCompat {
1212
public static void init() {
13-
if (FabricLoader.getInstance().isModLoaded("ftbteams")) {
13+
if (Platform.isModLoaded("ftbteams")) {
1414
TargetHelper.registerTeamMatcher("ftb", (attack, target) -> {
1515
if (attack instanceof PlayerEntity attackerPlayer && target instanceof PlayerEntity targetPlayer) {
1616
if (attackerPlayer.getWorld().isClient()) {

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
org.gradle.jvmargs=-Xmx2G
33

44
# Mod properties
5-
mod_version = 2.2.3
5+
mod_version = 2.2.4
66
maven_group = net.bettercombat
77
archives_name = bettercombat
88
enabled_platforms = fabric,neoforge

0 commit comments

Comments
 (0)