Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2025-02-28 18:21:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix TimedHandler not calling delegated handler (#1727)

Browse Source 
The original commit was calling super, which means that the actual
registered handlers were not called, also, added getInvincibility
which was originally missing
This commit is contained in:
Shane Freeder 2021-02-10 04:48:03 +00:00 committed by GitHub
parent 3c9b21d01f
commit 0c7f4bb8f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/session/TimedHandlerFactory.java
View File

@ -25,12 +25,14 @@
import com.sk89q.worldguard.LocalPlayer; import com.sk89q.worldguard.LocalPlayer;
import com.sk89q.worldguard.bukkit.WorldGuardPlugin; import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
import com.sk89q.worldguard.protection.ApplicableRegionSet; import com.sk89q.worldguard.protection.ApplicableRegionSet;
import com.sk89q.worldguard.protection.flags.StateFlag;
import com.sk89q.worldguard.protection.regions.ProtectedRegion; import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import com.sk89q.worldguard.session.MoveType; import com.sk89q.worldguard.session.MoveType;
import com.sk89q.worldguard.session.Session; import com.sk89q.worldguard.session.Session;
import com.sk89q.worldguard.session.handler.Handler; import com.sk89q.worldguard.session.handler.Handler;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.Nullable;
import java.security.CodeSource; import java.security.CodeSource;
import java.util.HashMap; import java.util.HashMap;
@ -87,28 +89,36 @@ static class TimedHandler extends Handler {
@Override @Override
public void initialize(LocalPlayer player, Location current, ApplicableRegionSet set) { public void initialize(LocalPlayer player, Location current, ApplicableRegionSet set) {
try (MCTiming ignored = timing.startTiming()) { try (MCTiming ignored = timing.startTiming()) {
super.initialize(player, current, set); handler.initialize(player, current, set);
} }
} }
@Override @Override
public boolean testMoveTo(LocalPlayer player, Location from, Location to, ApplicableRegionSet toSet, MoveType moveType) { public boolean testMoveTo(LocalPlayer player, Location from, Location to, ApplicableRegionSet toSet, MoveType moveType) {
try (MCTiming ignored = timing.startTiming()) { try (MCTiming ignored = timing.startTiming()) {
return super.testMoveTo(player, from, to, toSet, moveType); return handler.testMoveTo(player, from, to, toSet, moveType);
} }
} }
@Override @Override
public boolean onCrossBoundary(LocalPlayer player, Location from, Location to, ApplicableRegionSet toSet, Set<ProtectedRegion> entered, Set<ProtectedRegion> exited, MoveType moveType) { public boolean onCrossBoundary(LocalPlayer player, Location from, Location to, ApplicableRegionSet toSet, Set<ProtectedRegion> entered, Set<ProtectedRegion> exited, MoveType moveType) {
try (MCTiming ignored = timing.startTiming()) { try (MCTiming ignored = timing.startTiming()) {
return super.onCrossBoundary(player, from, to, toSet, entered, exited, moveType); return handler.onCrossBoundary(player, from, to, toSet, entered, exited, moveType);
} }
} }
@Override @Override
public void tick(LocalPlayer player, ApplicableRegionSet set) { public void tick(LocalPlayer player, ApplicableRegionSet set) {
try (MCTiming ignored = timing.startTiming()) { try (MCTiming ignored = timing.startTiming()) {
super.tick(player, set); handler.tick(player, set);
}
}
@Nullable
@Override
public StateFlag.State getInvincibility(LocalPlayer player) {
try (MCTiming ignored = timing.startTiming()) {
return handler.getInvincibility(player);
} }
} }