Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix the raid cooldown so that players can't just loop through the farm until the cooldown is over

Browse Source
This commit is contained in:
jmp
2020-09-09 08:40:24 -07:00
committed by BillyGalbreath
parent de30a3e5e2
commit 88ae09d686
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
patches/server/0127-Raid-cooldown-setting.patch
View File

@@ -1,11 +1,11 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: jmp <jasonpenilla2@me.com> From: jmp <jasonpenilla2@me.com>
Date: Sun, 23 Aug 2020 17:26:39 -0700 Date: Thu, 27 Aug 2020 13:48:52 -0700
Subject: [PATCH] Raid cooldown setting Subject: [PATCH] Raid cooldown setting
diff --git a/src/main/java/net/minecraft/server/PersistentRaid.java b/src/main/java/net/minecraft/server/PersistentRaid.java diff --git a/src/main/java/net/minecraft/server/PersistentRaid.java b/src/main/java/net/minecraft/server/PersistentRaid.java
index b46b20cae..89be52ca1 100644 index b46b20cae8..e7aee30555 100644
--- a/src/main/java/net/minecraft/server/PersistentRaid.java --- a/src/main/java/net/minecraft/server/PersistentRaid.java
+++ b/src/main/java/net/minecraft/server/PersistentRaid.java +++ b/src/main/java/net/minecraft/server/PersistentRaid.java
@@ -9,6 +9,7 @@ import javax.annotation.Nullable; @@ -9,6 +9,7 @@ import javax.annotation.Nullable;
@@ -34,24 +34,25 @@ index b46b20cae..89be52ca1 100644
Iterator iterator = this.raids.values().iterator(); Iterator iterator = this.raids.values().iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
@@ -67,6 +79,15 @@ public class PersistentRaid extends PersistentBase { @@ -110,10 +122,15 @@ public class PersistentRaid extends PersistentBase {
if (!dimensionmanager.hasRaids()) {
return null; if (flag) {
} else { // CraftBukkit start
+ // Purpur start - if (!org.bukkit.craftbukkit.event.CraftEventFactory.callRaidTriggerEvent(raid, entityplayer)) {
+ if (b.purpurConfig.raidCooldownSeconds != 0) { + if ((b.purpurConfig.raidCooldownSeconds != 0 && playerCooldowns.containsKey(entityplayer.getUniqueID())) || !org.bukkit.craftbukkit.event.CraftEventFactory.callRaidTriggerEvent(raid, entityplayer)) { // Purpur
+ if (!playerCooldowns.containsKey(entityplayer.getUniqueID())) { entityplayer.removeEffect(MobEffects.BAD_OMEN);
return null;
}
+ // Purpur start
+ if (b.purpurConfig.raidCooldownSeconds != 0) {
+ playerCooldowns.put(entityplayer.getUniqueID(), b.purpurConfig.raidCooldownSeconds); + playerCooldowns.put(entityplayer.getUniqueID(), b.purpurConfig.raidCooldownSeconds);
+ } else {
+ return null;
+ } + }
+ } + // Purpur end
+ // Purpur end
BlockPosition blockposition = entityplayer.getChunkCoordinates(); if (!this.raids.containsKey(raid.getId())) {
List<VillagePlaceRecord> list = (List) this.b.y().c(VillagePlaceType.b, blockposition, 64, VillagePlace.Occupancy.IS_OCCUPIED).collect(Collectors.toList()); this.raids.put(raid.getId(), raid);
int i = 0;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 755a46ee8..54e460ca8 100644 index 755a46ee8b..54e460ca8e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -155,6 +155,7 @@ public class PurpurWorldConfig { @@ -155,6 +155,7 @@ public class PurpurWorldConfig {