icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Should fix NPE when blowing stuff up, fixes #728

Browse Source
This commit is contained in:
gnembon committed 2021-03-02 00:04:05 -04:00
1 parent 4c12f0bdb7
commit ec25bf4032
1 file changed
+7 -5
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/helpers/OptimizedExplosion.java
+7 -5
View File
@@ -107,20 +107,22 @@ public class OptimizedExplosion
explosionSound++; explosionSound++;
Entity explodingEntity = eAccess.getEntity();
for (int k2 = 0; k2 < entitylist.size(); ++k2) { for (int k2 = 0; k2 < entitylist.size(); ++k2) {
Entity entity = entitylist.get(k2); Entity entity = entitylist.get(k2);
if (entity == eAccess.getEntity()) {
if (entity == explodingEntity) {
// entitylist.remove(k2); // entitylist.remove(k2);
removeFast(entitylist, k2); removeFast(entitylist, k2);
k2--; k2--;
continue; continue;
} }
if (entity instanceof TntEntity && if (entity instanceof TntEntity && explodingEntity != null &&
entity.getX() == eAccess.getEntity().getX() && entity.getX() == explodingEntity.getX() &&
entity.getY() == eAccess.getEntity().getY() && entity.getY() == explodingEntity.getY() &&
entity.getZ() == eAccess.getEntity().getZ()) { entity.getZ() == explodingEntity.getZ()) {
if (eLogger != null) { if (eLogger != null) {
eLogger.onEntityImpacted(entity, new Vec3d(0,-0.9923437498509884d, 0)); eLogger.onEntityImpacted(entity, new Vec3d(0,-0.9923437498509884d, 0));
} }