Skip to content
This repository was archived by the owner on Feb 8, 2019. It is now read-only.

Commit 86227d5

Browse files
committed
Merge branch 'master' into develop
2 parents 6c9853c + 09e138c commit 86227d5

File tree

6 files changed

+40
-3
lines changed

6 files changed

+40
-3
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ If applicable, add screenshots to help explain your problem.
1818

1919
**Desktop (please complete the following information):**
2020
- OS: [Windows, Linux, Android]
21-
- PocketMine-MP Version:
21+
- PocketMine-MP Version: 3.x.x
2222

2323
**Additional context**
2424
Add any other context about the problem here.

.github/ISSUE_TEMPLATE/custom.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
name: Custom issue template
3+
about: Describe this issue template's purpose here.
4+
5+
---
6+
7+
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
5+
---
6+
7+
**Is your feature request related to a problem? Please describe.**
8+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
9+
10+
**Describe the solution you'd like**
11+
A clear and concise description of what you want to happen.
12+
13+
**Describe alternatives you've considered**
14+
A clear and concise description of any alternative solutions or features you've considered.
15+
16+
**Additional context**
17+
Add any other context or screenshots about the feature request here.

PULL_REQUEST_TEMPLATE.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
## 概要
2+
<!-- 変更の目的 もしくは 関連する Issue 番号 -->
3+
4+
## 変更内容
5+
6+
## 影響範囲
7+
<!-- この関数を変更したのでこの機能にも影響がある、など -->
8+
9+
## 動作要件
10+
<!-- 動作に必要な 環境変数 / 依存関係 / DBの更新 など -->
11+
12+
## 補足
13+
<!-- レビューをする際に見てほしい点、ローカル環境で試す際の注意点、など -->

src/VectorNetworkProject/TheMix/game/corepvp/blue/BlueCoreManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static function getHP(): int
5151
public static function reduceHP(int $hp, Player $player): void
5252
{
5353
self::$hp -= $hp;
54-
if (self::getHP() === 0) {
54+
if (self::getHP() <= 0) {
5555
$event = new GameWinEvent(GameWinEvent::WIN_RED, $player);
5656
Server::getInstance()->getPluginManager()->callEvent($event);
5757
if ($event->isCancelled()) {

src/VectorNetworkProject/TheMix/game/corepvp/red/RedCoreManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static function getHP(): int
5151
public static function reduceHP(int $hp, Player $player): void
5252
{
5353
self::$hp -= $hp;
54-
if (self::getHP() === 0) {
54+
if (self::getHP() <= 0) {
5555
$event = new GameWinEvent(GameWinEvent::WIN_BLUE, $player);
5656
Server::getInstance()->getPluginManager()->callEvent($event);
5757
if ($event->isCancelled()) {

0 commit comments

Comments
 (0)