浏览代码

Merge branch 'Butzlabben:master' into refactoring

RedstoneFuture 3 年之前
父节点
当前提交
61ce276baf

+ 33 - 0
.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Server (please complete the following information):**
+ - OS: [e.g. Debian, Windows]
+ - Minecraft version [e.g. 1.12, 1.16, 1.17]
+ - Java version [e.g. 11, 17]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

+ 20 - 0
.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

+ 1 - 1
missilewars-plugin/pom.xml

@@ -26,7 +26,7 @@
         <version>1.0</version>
         <version>1.0</version>
     </parent>
     </parent>
 
 
-    <version>4.1.0</version>
+    <version>4.1.2</version>
 
 
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
 
 

+ 2 - 1
missilewars-plugin/src/main/java/de/butzlabben/missilewars/listener/GameListener.java

@@ -315,17 +315,18 @@ public class GameListener extends GameBoundListener {
         }
         }
     }
     }
 
 
+    // TODO - Analyse, Ingame Check and Crop Cancel Analytic
     @EventHandler
     @EventHandler
     public void onClick(InventoryClickEvent event) {
     public void onClick(InventoryClickEvent event) {
         if (!(event.getWhoClicked() instanceof Player)) return;
         if (!(event.getWhoClicked() instanceof Player)) return;
         Player p = (Player) event.getWhoClicked();
         Player p = (Player) event.getWhoClicked();
         if (!isInGameWorld(p.getLocation())) return;
         if (!isInGameWorld(p.getLocation())) return;
+
         if (p.getGameMode() == GameMode.CREATIVE || p.isOp()) return;
         if (p.getGameMode() == GameMode.CREATIVE || p.isOp()) return;
         if (event.getSlotType() != InventoryType.SlotType.ARMOR) return;
         if (event.getSlotType() != InventoryType.SlotType.ARMOR) return;
         event.setCancelled(true);
         event.setCancelled(true);
     }
     }
 
 
-
     private boolean isInBetween(Vector point, Plane plane1, Plane plane2) {
     private boolean isInBetween(Vector point, Plane plane1, Plane plane2) {
         double distanceBetween = plane1.distanceSquared(plane2.getSupport());
         double distanceBetween = plane1.distanceSquared(plane2.getSupport());
         double distance1 = plane1.distanceSquared(point);
         double distance1 = plane1.distanceSquared(point);

+ 1 - 2
missilewars-plugin/src/main/java/de/butzlabben/missilewars/wrapper/abstracts/arena/FallProtectionConfiguration.java

@@ -18,7 +18,6 @@
 
 
 package de.butzlabben.missilewars.wrapper.abstracts.arena;
 package de.butzlabben.missilewars.wrapper.abstracts.arena;
 
 
-
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.SerializedName;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
@@ -31,5 +30,5 @@ public class FallProtectionConfiguration {
 
 
     private final boolean enabled = true;
     private final boolean enabled = true;
     private final int duration = 60;
     private final int duration = 60;
-    @SerializedName("message_only_on_start") private final boolean messageOnlyOnStart = false;
+    @SerializedName("message_only_on_start") private boolean messageOnlyOnStart = false;
 }
 }

+ 0 - 2
pom.xml

@@ -124,7 +124,6 @@
         </dependency>
         </dependency>
     </dependencies>
     </dependencies>
 
 
-
     <build>
     <build>
         <finalName>${project.artifactId}</finalName>
         <finalName>${project.artifactId}</finalName>
         <defaultGoal>package</defaultGoal>
         <defaultGoal>package</defaultGoal>
@@ -158,7 +157,6 @@
                     <relocations>
                     <relocations>
                         <relocation>
                         <relocation>
                             <pattern>org.bstats</pattern>
                             <pattern>org.bstats</pattern>
-                            <!-- Replace this with your package! -->
                             <shadedPattern>de.butzlabben.missilewars</shadedPattern>
                             <shadedPattern>de.butzlabben.missilewars</shadedPattern>
                         </relocation>
                         </relocation>
                     </relocations>
                     </relocations>