Use PaperLib for some performance enhancements.

EngineHub · Jul 27, 2019 · 2e828e6 · 2e828e6
1 parent 4044e2b
commit 2e828e6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/config/checkstyle/import-control.xml b/config/checkstyle/import-control.xml
@@ -22,6 +22,8 @@
     <subpackage name="bukkit">
       <allow pkg="org.bukkit"/>
       <allow pkg="org.bstats.bukkit"/>
+      <allow pkg="io.papermc.lib"/>
+      <allow pkg="com.destroystokyo.paper"/>
     </subpackage>
 
     <subpackage name="sponge">

diff --git a/worldguard-bukkit/build.gradle b/worldguard-bukkit/build.gradle
@@ -2,10 +2,8 @@ apply plugin: 'eclipse'
 apply plugin: 'idea'
 
 repositories {
-    maven {
-        name = 'bstats repo'
-        url = 'https://repo.codemc.org/repository/maven-public'
-    }
+    maven { url = 'https://repo.codemc.org/repository/maven-public' }
+    maven { url = 'https://papermc.io/repo/repository/maven-public/' }
 }
 
 dependencies {
@@ -14,6 +12,8 @@ dependencies {
     api ('com.sk89q.worldedit:worldedit-bukkit:7.0.1-SNAPSHOT') {
         exclude group: 'io.papermc', module: 'paperlib'
     }
+    implementation 'io.papermc:paperlib:1.0.2'
+    compileOnly 'com.destroystokyo.paper:paper-api:1.13.2-R0.1-SNAPSHOT'
     implementation ('com.sk89q:commandbook:2.3') {
         exclude group: 'com.sk89q', module: 'worldedit'
         exclude group: 'com.zachsthings.libcomponents'
@@ -46,6 +46,9 @@ shadowJar {
         relocate ("org.bstats", "com.sk89q.worldguard.bukkit.bstats") {
             include(dependency("org.bstats:bstats-bukkit:1.5"))
         }
+        relocate ("io.papermc.lib", "com.sk89q.worldguard.bukkit.paperlib") {
+            include(dependency("io.papermc:paperlib:1.0.2"))
+        }
     }
 
     relocate('org.flywaydb', 'com.sk89q.worldguard.internal.flywaydb')

diff --git a/...d-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java b/...d-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
@@ -419,8 +419,8 @@ public void onPlayerInteract(PlayerInteractEvent event) {
                     // Only fire events for blocks that are modified when right clicked
                     final boolean hasItemInteraction = item != null && isItemAppliedToBlock(item, clicked)
                             && event.getAction() == Action.RIGHT_CLICK_BLOCK;
-                    modifiesWorld = isBlockModifiedOnClick(clicked, event.getAction() == Action.RIGHT_CLICK_BLOCK)
-                            || hasItemInteraction;
+                    modifiesWorld = hasItemInteraction
+                            || isBlockModifiedOnClick(clicked, event.getAction() == Action.RIGHT_CLICK_BLOCK);
 
                     if (Events.fireAndTestCancel(new UseBlockEvent(event, cause, clicked).setAllowed(!modifiesWorld))) {
                         event.setUseInteractedBlock(Result.DENY);

diff --git a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Blocks.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Blocks.java
@@ -19,6 +19,7 @@
 
 package com.sk89q.worldguard.bukkit.util;
 
+import io.papermc.lib.PaperLib;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.data.BlockData;
@@ -45,7 +46,7 @@ private Blocks() {
      * @return a list of connected blocks, not including the given block
      */
     public static List<Block> getConnected(Block block) {
-        BlockState state = block.getState();
+        BlockState state = PaperLib.getBlockState(block, false).getState();
         BlockData data = state.getBlockData();
 
         if (data instanceof Bed) {