Disabled Player-Player and Player-Drone collisions

2019-10-01 20:28:40 -04:00
parent cb929a7239
commit 8ccdba5be2
4 changed files with 42 additions and 8 deletions
@@ -1,12 +1,16 @@
 package io.anuke.mindustry.game;

+import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.Vars;
+import io.anuke.mindustry.mod.Mods.*;
 import io.anuke.mindustry.type.ContentType;


 /** Base class for a content type that is loaded in {@link io.anuke.mindustry.core.ContentLoader}. */
 public abstract class Content{
    public final short id;
+    /** The mod that loaded this piece of content. */
+    public @Nullable LoadedMod mod;

    public Content(){
        this.id = (short)Vars.content.getBy(getContentType()).size;