This repository has been archived by the owner on Nov 1, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix Protected Regions NPE through API
- Loading branch information
Showing
1 changed file
with
3 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 48b843febecc5c99c6caebe713cc24ba0b4b181f Mon Sep 17 00:00:00 2001 | ||
From 6af0db7aff392359f865f5201e8b1d89dbcd6913 Mon Sep 17 00:00:00 2001 | ||
From: SuicidalKids <[email protected]> | ||
Date: Tue, 15 Sep 2020 05:06:25 +0100 | ||
Subject: [PATCH] Explosion Improvements | ||
|
@@ -49,7 +49,7 @@ index c4bfd5fe6..03bc6c5ab 100644 | |
this.datawatcher = new DataWatcher(this); | ||
this.datawatcher.a(0, Byte.valueOf((byte) 0)); | ||
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java | ||
index f4ccd8d4d..ab6c76118 100644 | ||
index f4ccd8d4d..9f33563e9 100644 | ||
--- a/src/main/java/net/minecraft/server/Explosion.java | ||
+++ b/src/main/java/net/minecraft/server/Explosion.java | ||
@@ -3,11 +3,8 @@ package net.minecraft.server; | ||
|
@@ -78,7 +78,7 @@ index f4ccd8d4d..ab6c76118 100644 | |
|
||
if (!this.world.tacoSpigotConfig.optimizeLiquidExplosions || !b.getMaterial().isLiquid()) { //TacoSpigot - skip calculating what blocks to blow up in water/lava | ||
+ boolean protection = false; | ||
+ if (world.ionConfig.explosionProtectedRegions) { | ||
+ if (world.ionConfig.explosionProtectedRegions && source != null) { | ||
+ Location location = new Location(world.getWorld(), posX, posY, posZ); | ||
+ | ||
+ List<org.bukkit.block.Block> list = new java.util.ArrayList<>(1); | ||
|