GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Properly implement piglin/hoglin dimension safety

Browse source 
Whether they shake or not is now controlled by the server, as implemented in Java Edition.
This commit is contained in:
Camotoy 2021-12-20 22:54:34 -05:00
parent fd955a66af
commit 4c409f98f3
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/src/main/java/org/geysermc/geyser/entity/type/living/animal/HoglinEntity.java
View file

@ -29,9 +29,8 @@ import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanE
import com.nukkitx.math.vector.Vector3f; import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import org.geysermc.geyser.entity.EntityDefinition; import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.registry.type.ItemMapping; import org.geysermc.geyser.registry.type.ItemMapping;
import org.geysermc.geyser.util.DimensionUtils; import org.geysermc.geyser.session.GeyserSession;
import java.util.UUID; import java.util.UUID;
@ -50,7 +49,7 @@ public class HoglinEntity extends AnimalEntity {
@Override @Override
protected boolean isShaking() { protected boolean isShaking() {
return (!isImmuneToZombification && !session.getDimension().equals(DimensionUtils.NETHER)) || super.isShaking(); return (!isImmuneToZombification && !session.isDimensionPiglinSafe()) || super.isShaking();
} }
@Override @Override

3
core/src/main/java/org/geysermc/geyser/entity/type/living/monster/BasePiglinEntity.java
View file

@ -30,7 +30,6 @@ import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import org.geysermc.geyser.entity.EntityDefinition; import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.util.DimensionUtils;
import java.util.UUID; import java.util.UUID;
@ -49,6 +48,6 @@ public class BasePiglinEntity extends MonsterEntity {
@Override @Override
protected boolean isShaking() { protected boolean isShaking() {
return (!isImmuneToZombification && !session.getDimension().equals(DimensionUtils.NETHER)) || super.isShaking(); return (!isImmuneToZombification && !session.isDimensionPiglinSafe()) || super.isShaking();
} }
} }

6
core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
View file

@ -302,6 +302,12 @@ public class GeyserSession implements GeyserConnection, CommandSender {
*/ */
@Setter @Setter
private String dimension = DimensionUtils.OVERWORLD; private String dimension = DimensionUtils.OVERWORLD;
/**
* Whether piglins and hoglins are safe from conversion in this dimension.
* This controls if they have the shaking effect applied in the dimension.
*/
@Setter
private boolean dimensionPiglinSafe;
@Setter @Setter
private int breakingBlock; private int breakingBlock;

3
core/src/main/java/org/geysermc/geyser/util/ChunkUtils.java
View file

@ -265,5 +265,8 @@ public class ChunkUtils {
// Load world coordinate scale for the world border // Load world coordinate scale for the world border
double coordinateScale = ((Number) dimensionTag.get("coordinate_scale").getValue()).doubleValue(); double coordinateScale = ((Number) dimensionTag.get("coordinate_scale").getValue()).doubleValue();
session.getWorldBorder().setWorldCoordinateScale(coordinateScale); session.getWorldBorder().setWorldCoordinateScale(coordinateScale);
// Set if piglins/hoglins should shake
session.setDimensionPiglinSafe(((Number) dimensionTag.get("piglin_safe").getValue()).byteValue() != (byte) 0);
} }
} }