Skip to content

Fixed null issues causing server crashes #922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
imbavirus wants to merge 1 commit into
base: 1.21.1
Choose a base branch
from
Open

Fixed null issues causing server crashes #922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions Common/src/main/java/tschipp/carryon/CarryOnCommon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import net.minecraft.core.RegistryAccess;
import net.minecraft.core.RegistrySetBuilder;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffects;
Expand Down Expand Up @@ -206,9 +207,15 @@ public static int potionLevel(CarryOnData carry, Level level)
i = 1;
return (int) (i * Constants.COMMON_CONFIG.settings.entitySlownessMultiplier);
}
if(carry.isCarrying(CarryType.BLOCK))
if(carry.isCarrying(CarryType.BLOCK))
{
try
{
String nbt = carry.getNbt().toString();
CompoundTag nbtTag = carry.getNbt();
if(nbtTag == null)
return (int) Constants.COMMON_CONFIG.settings.blockSlownessMultiplier;

String nbt = nbtTag.toString();
int i = nbt.length() / 500;

if (i > 4)
Expand All @@ -219,6 +226,14 @@ public static int potionLevel(CarryOnData carry, Level level)

return (int) (i * Constants.COMMON_CONFIG.settings.blockSlownessMultiplier);
}
catch (NullPointerException e)
{
// Handle case where NBT contains null values that cause sorting to fail
// Return default slowness level to prevent crash
Constants.LOG.warn("Failed to calculate potion level from NBT due to null values, using default", e);
return (int) Constants.COMMON_CONFIG.settings.blockSlownessMultiplier;
}
}
return 0;
}
}
21 changes: 14 additions & 7 deletions Common/src/main/java/tschipp/carryon/common/carry/CarryOnData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,20 @@ public Entity getEntity(Level level)
if(this.type != CarryType.ENTITY)
throw new IllegalStateException("Called getEntity on data that contained " + this.type);

var optionalEntity = EntityType.create(nbt.getCompound("entity"), level);
if(optionalEntity.isPresent())
return optionalEntity.get();

Constants.LOG.error("Called EntityType#create even though no entity data was present. Data: " + nbt.toString());
this.clear();
return new AreaEffectCloud(level, 0, 0, 0);
var optionalEntity = EntityType.create(nbt.getCompound("entity"), level);
if(optionalEntity.isPresent())
return optionalEntity.get();

try
{
Constants.LOG.error("Called EntityType#create even though no entity data was present. Data: " + nbt.toString());
}
catch (NullPointerException e)
{
Constants.LOG.error("Called EntityType#create even though no entity data was present. NBT contains null values and cannot be converted to string.");
}
this.clear();
return new AreaEffectCloud(level, 0, 0, 0);
}

public Optional<CarryOnScript> getActiveScript()
Expand Down
30 changes: 22 additions & 8 deletions Common/src/main/java/tschipp/carryon/common/command/CommandCarryOn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,19 @@ private static int handleDebug(CommandSourceStack source)
ServerPlayer player = source.getPlayerOrException();

CarryOnData carry = CarryOnDataManager.getCarryData(player);
if (carry.isCarrying(CarryType.BLOCK))
if (carry.isCarrying(CarryType.BLOCK))
{
BlockState block = carry.getBlock();
log(source,"Block: " + block.getBlock());
log(source,"BlockState: " + block);
try
{
BlockState block = carry.getBlock();
log(source,"Block: " + block.getBlock());
log(source,"BlockState: " + block);
log(source,"NBT: " + carry.getNbt());
}
catch (NullPointerException e)
{
log(source,"NBT: [Error: NBT contains null values and cannot be converted to string]");
}

Optional<ModelOverride> ov = ModelOverrideHandler.getModelOverride(block, carry.getContentNbt());
if(ov.isPresent())
Expand All @@ -93,12 +100,19 @@ private static int handleDebug(CommandSourceStack source)

return 1;
}
else if (carry.isCarrying(CarryType.ENTITY))
else if (carry.isCarrying(CarryType.ENTITY))
{
Entity entity = carry.getEntity(player.level());
log(source,"Entity: " + entity);
log(source,"Entity Name: " + entity.getType());
try
{
Entity entity = carry.getEntity(player.level());
log(source,"Entity: " + entity);
log(source,"Entity Name: " + entity.getType());
log(source,"NBT: " + carry.getNbt());
}
catch (NullPointerException e)
{
log(source,"NBT: [Error: NBT contains null values and cannot be converted to string]");
}

Optional<PickupCondition> cond = PickupConditionHandler.getPickupCondition(entity);
if(cond.isPresent())
Expand Down