From 86bc78e4b88422da994a426f7634d28316b267df Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Wed, 26 Apr 2017 14:36:52 +0200
Subject: [PATCH] * Nest of Scarabs - Fixed that it does not produce tokens
 when -1/-1 counters are placed on creatures.

---
 Mage.Sets/src/mage/cards/n/NestOfScarabs.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/n/NestOfScarabs.java b/Mage.Sets/src/mage/cards/n/NestOfScarabs.java
index b844353245c..81cd6fdbfa1 100644
--- a/Mage.Sets/src/mage/cards/n/NestOfScarabs.java
+++ b/Mage.Sets/src/mage/cards/n/NestOfScarabs.java
@@ -28,7 +28,6 @@
 package mage.cards.n;
 
 import java.util.UUID;
-
 import mage.MageInt;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.dynamicvalue.common.EffectKeyValue;
@@ -70,7 +69,7 @@ public class NestOfScarabs extends CardImpl {
 class NestOfScarabsTriggeredAbility extends TriggeredAbilityImpl {
 
     NestOfScarabsTriggeredAbility() {
-        super(Zone.BATTLEFIELD, new CreateTokenEffect(new BlackInsectToken(), new EffectKeyValue("countersAdded")));
+        super(Zone.BATTLEFIELD, new CreateTokenEffect(new NestOfScarabsBlackInsectToken(), new EffectKeyValue("countersAdded")));
     }
 
     NestOfScarabsTriggeredAbility(final NestOfScarabsTriggeredAbility ability) {
@@ -84,9 +83,9 @@ class NestOfScarabsTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        boolean weAreDoingIt = getControllerId().equals(game.getControllerId(event.getSourceId()));
+        boolean weAreDoingIt = getControllerId().equals(game.getControllerId(event.getPlayerId()));
         boolean isM1M1Counters = event.getData().equals(CounterType.M1M1.getName());
-        if (weAreDoingIt && isM1M1Counters) {
+        if (weAreDoingIt && isM1M1Counters && event.getAmount() > 0) {
             Permanent permanent = game.getPermanentOrLKIBattlefield(event.getTargetId());
             if (permanent == null) {
                 permanent = game.getPermanentEntering(event.getTargetId());
@@ -110,8 +109,9 @@ class NestOfScarabsTriggeredAbility extends TriggeredAbilityImpl {
     }
 }
 
-class BlackInsectToken extends Token {
-    BlackInsectToken() {
+class NestOfScarabsBlackInsectToken extends Token {
+
+    NestOfScarabsBlackInsectToken() {
         super("Insect", "1/1 black Insect token");
         cardType.add(CardType.CREATURE);
         color.setBlack(true);