Skip to content

Commit ccd4a70

Browse files
author
iso2013
committed
Fix an NPE caused by setting things up in the wrong order.
1 parent 0fefb9c commit ccd4a70

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

API/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>PacketEntityAPI</artifactId>
77
<groupId>net.blitzcube.peapi</groupId>
8-
<version>0.4.2-SNAPSHOT</version>
8+
<version>0.4.3-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

Plugin/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>PacketEntityAPI</artifactId>
88
<groupId>net.blitzcube.peapi</groupId>
9-
<version>0.4.2-SNAPSHOT</version>
9+
<version>0.4.3-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>Plugin</artifactId>
@@ -59,7 +59,7 @@
5959
<dependency>
6060
<groupId>net.blitzcube.peapi</groupId>
6161
<artifactId>API</artifactId>
62-
<version>0.4.2-SNAPSHOT</version>
62+
<version>0.4.3-SNAPSHOT</version>
6363
</dependency>
6464
</dependencies>
6565
</project>

Plugin/src/main/java/net/blitzcube/peapi/event/engine/PacketEventDispatcher.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,6 @@ public PacketEventDispatcher(PacketEntityAPI parent, ProtocolManager manager) {
3333

3434
public void add(IListener l) {
3535
this.allListeners.add(l);
36-
if (l.shouldFireForFake()) {
37-
if (sendingForFake == 0) engine.setSendForFake(true);
38-
sendingForFake++;
39-
}
40-
if (l.requiresCollidable()) {
41-
if (requiresCollidable == 0) engine.setCollidable(true);
42-
requiresCollidable++;
43-
}
4436
boolean e = false, o = false;
4537
for (EntityType en : l.getTargets()) {
4638
listenerLookup.putIfAbsent(en, new TreeSet<>(LISTENER_COMPARATOR));
@@ -62,6 +54,14 @@ public void add(IListener l) {
6254
targetingEntities++;
6355
entityListeners.add(l);
6456
}
57+
if (l.shouldFireForFake()) {
58+
if (sendingForFake == 0) engine.setSendForFake(true);
59+
sendingForFake++;
60+
}
61+
if (l.requiresCollidable()) {
62+
if (requiresCollidable == 0) engine.setCollidable(true);
63+
requiresCollidable++;
64+
}
6565
}
6666

6767
public void dispatch(IEntityPacketEvent e, Boolean object) {

Plugin/src/main/java/net/blitzcube/peapi/event/engine/PacketEventEngine.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ class PacketEventEngine {
2424
}
2525

2626
void setSendForFake(boolean sendForFake) {
27-
entity.setSendForFake(sendForFake);
28-
generic.setSendForFake(sendForFake);
29-
object.setSendForFake(sendForFake);
27+
if (entity != null) entity.setSendForFake(sendForFake);
28+
if (generic != null) generic.setSendForFake(sendForFake);
29+
if (object != null) object.setSendForFake(sendForFake);
3030
}
3131

3232
void setCollidable(boolean collidable) {

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>net.blitzcube.peapi</groupId>
88
<artifactId>PacketEntityAPI</artifactId>
99
<packaging>pom</packaging>
10-
<version>0.4.2-SNAPSHOT</version>
10+
<version>0.4.3-SNAPSHOT</version>
1111
<modules>
1212
<module>API</module>
1313
<module>Plugin</module>

0 commit comments

Comments
 (0)