mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
good monring and good night
This commit is contained in:
parent
f7659acde1
commit
e518ef48c9
@ -4,3 +4,5 @@
|
|||||||
|
|
||||||
## Fixed
|
## Fixed
|
||||||
* Fixed a potential crash caused by cargo dropships landing on cargo docks with no satellite chip installed
|
* Fixed a potential crash caused by cargo dropships landing on cargo docks with no satellite chip installed
|
||||||
|
* Fixed potential crash related to hazard handling for dropped items
|
||||||
|
* Fixed errors thrown when loading in old system bullet entities
|
||||||
@ -581,27 +581,14 @@ public class EntityBulletBaseNT extends EntityThrowableInterp implements IBullet
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void readEntityFromNBT(NBTTagCompound nbt) {
|
public boolean writeToNBTOptional(NBTTagCompound nbt) {
|
||||||
super.readEntityFromNBT(nbt);
|
return false;
|
||||||
int cfg = nbt.getInteger("config");
|
|
||||||
this.config = BulletConfigSyncingUtil.pullConfig(cfg);
|
|
||||||
this.dataWatcher.updateObject(16, (byte)this.config.style);
|
|
||||||
this.dataWatcher.updateObject(17, (byte)this.config.trail);
|
|
||||||
|
|
||||||
if(this.config == null) {
|
|
||||||
this.setDead();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.overrideDamage = nbt.getFloat("damage");
|
|
||||||
this.dataWatcher.updateObject(18, cfg);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeEntityToNBT(NBTTagCompound nbt) {
|
public void readEntityFromNBT(NBTTagCompound nbt) {
|
||||||
super.writeEntityToNBT(nbt);
|
super.readEntityFromNBT(nbt);
|
||||||
nbt.setInteger("config", dataWatcher.getWatchableObjectInt(18));
|
this.setDead();
|
||||||
nbt.setFloat("damage", this.overrideDamage);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static interface IBulletHurtBehaviorNT { public void behaveEntityHurt(EntityBulletBaseNT bullet, Entity hit); }
|
public static interface IBulletHurtBehaviorNT { public void behaveEntityHurt(EntityBulletBaseNT bullet, Entity hit); }
|
||||||
|
|||||||
@ -655,7 +655,10 @@ public class ModEventHandler {
|
|||||||
|
|
||||||
if(event.phase == Phase.END) {
|
if(event.phase == Phase.END) {
|
||||||
|
|
||||||
for(Object e : event.world.loadedEntityList) {
|
List loadedEntityList = new ArrayList();
|
||||||
|
loadedEntityList.addAll(event.world.loadedEntityList); // ConcurrentModificationException my balls
|
||||||
|
|
||||||
|
for(Object e : loadedEntityList) {
|
||||||
|
|
||||||
if(e instanceof EntityItem) {
|
if(e instanceof EntityItem) {
|
||||||
EntityItem item = (EntityItem) e;
|
EntityItem item = (EntityItem) e;
|
||||||
|
|||||||
5748
src/main/resources/assets/hbm/models/weapons/charge_thrower.obj
Normal file
5748
src/main/resources/assets/hbm/models/weapons/charge_thrower.obj
Normal file
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
Loading…
x
Reference in New Issue
Block a user