Fix a silly bug resulting in unmount packets being cancelled.

iso2013 · Jun 16, 2018 · 71687b5 · 71687b5
1 parent edde72d
commit 71687b5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/API/pom.xml b/API/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>PacketEntityAPI</artifactId>
         <groupId>net.blitzcube.peapi</groupId>
-        <version>0.4.0-SNAPSHOT</version>
+        <version>0.4.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/Plugin/pom.xml b/Plugin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>PacketEntityAPI</artifactId>
         <groupId>net.blitzcube.peapi</groupId>
-        <version>0.4.0-SNAPSHOT</version>
+        <version>0.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>Plugin</artifactId>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>net.blitzcube.peapi</groupId>
             <artifactId>API</artifactId>
-            <version>0.4.0-SNAPSHOT</version>
+            <version>0.4.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/Plugin/src/main/java/net/blitzcube/peapi/event/engine/listeners/GenericListener.java b/Plugin/src/main/java/net/blitzcube/peapi/event/engine/listeners/GenericListener.java
@@ -69,7 +69,8 @@ public void onPacketSending(PacketEvent packetEvent) {
         IEntityPacketEvent e = new EntityPacketEvent(manager, w, eT, target);
         dispatcher.dispatch(e, null);
         if (e.getPacket() instanceof IEntityGroupPacket) {
-            if (((IEntityGroupPacket) e.getPacket()).getGroup().size() == 0 || e.isCancelled()) {
+            if ((e.getPacketType() == IEntityPacketEvent.EntityPacketType.DESTROY
+                    && ((IEntityGroupPacket) e.getPacket()).getGroup().size() == 0) || e.isCancelled()) {
                 packetEvent.setCancelled(true);
                 return;
             }

diff --git a/Plugin/src/main/java/net/blitzcube/peapi/packet/ObjectSpawnPacket.java b/Plugin/src/main/java/net/blitzcube/peapi/packet/ObjectSpawnPacket.java
@@ -246,7 +246,7 @@ public void setVelocity(Vector velocity) {
                         type != EntityType.EXPERIENCE_ORB,
                 "You cannot set a velocity for a " + type.name() + "!");
         this.velocity = velocity;
-        //TODO: This is wrong.
+        //FixMe: This implementation is not correct.
         super.rawPacket.getIntegers().write(1, (int) velocity.getX());
         super.rawPacket.getIntegers().write(2, (int) velocity.getY());
         super.rawPacket.getIntegers().write(3, (int) velocity.getZ());

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>net.blitzcube.peapi</groupId>
     <artifactId>PacketEntityAPI</artifactId>
     <packaging>pom</packaging>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <modules>
         <module>API</module>
         <module>Plugin</module>