CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

bump vrsion

Browse Source
This commit is contained in:
okx-code
2025-03-08 20:58:45 +00:00
parent 74e761fef0
commit 98f4ae21bb
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/libs.versions.toml
View File

@@ -1,5 +1,5 @@
[versions]
paper = "1.21.3-R0.1-SNAPSHOT"
paper = "1.21.4-R0.1-SNAPSHOT"
junit = "5.8.2"
nuotifier = "2.7.2"

4
plugins/civduties-paper/build.gradle.kts
View File

@@ -12,5 +12,7 @@ dependencies {
compileOnly(project(":plugins:civmodcore-paper"))
compileOnly(project(":plugins:combattagplus-paper"))
compileOnly(libs.vault.api)
compileOnly(libs.vault.api) {
exclude(group = "org.bukkit")
}
}

2
plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerHelperImpl.java
View File

@@ -45,7 +45,7 @@ public class NpcPlayerHelperImpl implements NpcPlayerHelper {
npcPlayer.spawnIn(worldServer);
npcPlayer.forceSetPositionRotation(l.getX(), l.getY(), l.getZ(), l.getYaw(), l.getPitch());
npcPlayer.gameMode.setLevel(worldServer);
npcPlayer.spawnInvulnerableTime = 0;
npcPlayer.invulnerableTime = 0;
for (ServerPlayer serverPlayer : MinecraftServer.getServer().getPlayerList().getPlayers()) {
if (serverPlayer instanceof NpcPlayer) continue;

2
plugins/finale-paper/src/main/java/com/github/maxopoly/finale/combat/CombatUtil.java
View File

@@ -147,7 +147,7 @@ public class CombatUtil {
if (entityliving != attacker && entityliving != victim && !attacker.skipAttackInteraction(entityliving) && (!(entityliving instanceof ArmorStand) || !((ArmorStand) entityliving).isMarker()) && attacker.distanceToSqr(entityliving) < 9.0D) {
// CraftBukkit start - Only apply knockback if the damage hits
if (entityliving.hurtServer(entityliving.level().getMinecraftWorld(), world.damageSources().playerAttack(attacker).sweep().critical(shouldCrit), f4)) {
if (entityliving.hurtServer(entityliving.level().getMinecraftWorld(), world.damageSources().playerAttack(attacker), f4)) {
entityliving.knockback(0.4F, (double) Mth.sin(attacker.getBukkitYaw() * 0.017453292F), (double) (-Mth.cos(attacker.getBukkitYaw() * 0.017453292F)));
}
// CraftBukkit end