From 98997d90ac3918da9bfc311dd4798ae57ca2dc8f Mon Sep 17 00:00:00 2001 From: WinDanesz <31292708+WinDanesz@users.noreply.github.com> Date: Sat, 9 Jul 2022 23:29:24 +0200 Subject: [PATCH] Fake players don't drop spell books (#818) Magic shouldn't be automated Co-authored-by: DrParadox7 <47131096+DrParadox7@users.noreply.github.com> --- build.gradle | 17 +++++++++++++++-- .../wizardry/WizardryEventHandler.java | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 92e3f5b5..2a5bae82 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,27 @@ buildscript { repositories { - mavenCentral() + + // [HTTPS FIX] Replace mavenCentral() with the code block below + maven { + url = "https://maven.minecraftforge.net/" + } + maven { name = "forge" - url = "http://files.minecraftforge.net/maven" + url = "https://files.minecraftforge.net/maven" + } + maven { + name = "forge2" + url = "https://maven.minecraftforge.net/" } maven { name = "sonatype" url = "https://oss.sonatype.org/content/repositories/snapshots/" } + + flatDir { + dirs 'libs' + } } dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' diff --git a/src/main/java/electroblob/wizardry/WizardryEventHandler.java b/src/main/java/electroblob/wizardry/WizardryEventHandler.java index f5e530cc..6b2dae23 100644 --- a/src/main/java/electroblob/wizardry/WizardryEventHandler.java +++ b/src/main/java/electroblob/wizardry/WizardryEventHandler.java @@ -801,7 +801,7 @@ public class WizardryEventHandler { @SubscribeEvent public void onLivingDropsEvent(LivingDropsEvent event){ // Evil wizards drop spell books themselves - if(event.entityLiving instanceof EntityMob && !(event.entityLiving instanceof EntityEvilWizard) && event.source.getEntity() instanceof EntityPlayer && Wizardry.spellBookDropChance > 0){ + if(event.entityLiving instanceof EntityMob && !(event.entityLiving instanceof EntityEvilWizard) && event.source.getEntity() instanceof EntityPlayer && !(event.source.getEntity() instanceof FakePlayer) && Wizardry.spellBookDropChance > 0){ // This does exactly what the entity drop method does, but with a different random number so that the // spell book doesn't always drop with other rare drops.