Merge branch 'mc-1.7.10' into 4.2

Fix #1117 Radioactive bee effect can bypass apiarist suit
2026-11-15 01:24:59 +00:00 · 2016-03-22 12:29:14 -07:00 · 2016-03-22 12:28:31 -07:00
2 changed files with 2 additions and 2 deletions
@@ -2,4 +2,4 @@ mcversion=1.7.10
 forgeversion=10.13.4.1566-1.7.10
 version_major=4
 version_minor=2
-version_patch=10
+version_patch=11
@@ -49,7 +49,7 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled {

 			// Entities are not attacked if they wear a full set of apiarist's armor.
 			int count = BeeManager.armorApiaristHelper.wearsItems(entity, getUID(), true);
-			damage -= count;
+			damage -= (count * 2);
 			if (damage <= 0) {
 				continue;
 			}
Author	SHA1	Message	Date
mezz	b83da5c628	Merge branch 'mc-1.7.10' into 4.2	2016-03-22 12:29:14 -07:00
mezz	4a2af4743f	Fix #1117 Radioactive bee effect can bypass apiarist suit	2016-03-22 12:28:31 -07:00